From 8c0433d154c89062c3e9ed084a1d5a9ba309326c Mon Sep 17 00:00:00 2001 From: Mathieu Lacage Date: Wed, 1 Jul 2009 14:38:43 +0200 Subject: [PATCH 01/46] typo --- RELEASE_NOTES | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RELEASE_NOTES b/RELEASE_NOTES index d0081fe9d..3235305a3 100644 --- a/RELEASE_NOTES +++ b/RELEASE_NOTES @@ -18,7 +18,7 @@ http://www.nsnam.org/releases/ns-3.5.tar.bz2 Supported platforms ------------------- -ns-3.4 has been tested on the following platforms: +ns-3.5 has been tested on the following platforms: - linux x86 gcc 4.2, 4.1, and, 3.4.6. - linux x86_64 gcc 4.4.0, 4.3.2, 4.2.3, 4.2.1, 4.1.3, 3.4.6 - MacOS X ppc and x86 (gcc 4.0.x and 4.2.x) From b49f043827b2fbd97bfe19cc1964ac90f5408e45 Mon Sep 17 00:00:00 2001 From: Tom Henderson Date: Thu, 2 Jul 2009 05:38:33 -0700 Subject: [PATCH 02/46] document global routing API changes --- CHANGES.html | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/CHANGES.html b/CHANGES.html index 62da83d7a..e9b6d7bae 100644 --- a/CHANGES.html +++ b/CHANGES.html @@ -85,6 +85,23 @@ was just a pass-through to GetDevice ()->GetMtu ().

+
  • GlobalRouteManager::PopulateRoutingTables () and RecomputeRoutingTables () are deprecated +

    This API has been moved to the helper API and the above functions will +be removed in ns-3.6. The new API is: +

    +Ipv4GlobalRoutingHelper::PopulateRoutingTables ();
+Ipv4GlobalRoutingHelper::RecomputeRoutingTables ();
+
    +Additionally, these low-level functions in GlobalRouteManager are now public, +allowing more API flexibility at the low level ns-3 API: +
    +GlobalRouteManager::DeleteGlobalRoutes ();
+GlobalRouteManager::BuildGlobalRoutingDatabase ();
+GlobalRouteManager::InitializeRoutes ();
+
    +

    +
    • +
  • CalcChecksum attribute changes

    Four IPv4 CalcChecksum attributes (which enable the computation of checksums that are disabled by default) have been collapsed into one global From a3bc8265a824f6a7261100c69fdb122984e49bb7 Mon Sep 17 00:00:00 2001 From: Andrey Hippo Date: Thu, 2 Jul 2009 15:11:03 +0200 Subject: [PATCH 03/46] download url should point to allinone tarball --- RELEASE_NOTES | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/RELEASE_NOTES b/RELEASE_NOTES index 3235305a3..4264e8903 100644 --- a/RELEASE_NOTES +++ b/RELEASE_NOTES @@ -14,7 +14,7 @@ Release 3.5 Availability ------------ This release is immediately available from: -http://www.nsnam.org/releases/ns-3.5.tar.bz2 +http://www.nsnam.org/releases/ns-allinone-3.5.tar.bz2 Supported platforms ------------------- @@ -73,7 +73,7 @@ Release 3.4 Availability ------------ This release is immediately available from: -http://www.nsnam.org/releases/ns-3.4.tar.bz2 +http://www.nsnam.org/releases/ns-allinone-3.4.tar.bz2 Supported platforms ------------------- From cfc93e2f83807003d2a4ae0ef8bbe09c581889ce Mon Sep 17 00:00:00 2001 From: Andrey Hippo Date: Thu, 2 Jul 2009 15:13:27 +0200 Subject: [PATCH 04/46] escape html special characters --- CHANGES.html | 82 ++++++++++++++++++++++++++-------------------------- 1 file changed, 41 insertions(+), 41 deletions(-) diff --git a/CHANGES.html b/CHANGES.html index 62da83d7a..43ab5de41 100644 --- a/CHANGES.html +++ b/CHANGES.html @@ -81,7 +81,7 @@ fragmentation and reassembly.

  • Ipv4Interface::GetMtu () deleted

    The Ipv4Interface API is private to internet-stack module; this method -was just a pass-through to GetDevice ()->GetMtu (). +was just a pass-through to GetDevice ()->GetMtu ().

    • @@ -141,16 +141,16 @@ GlobalValue::Bind ("ChecksumEnabled", BooleanValue (true));

    To accommodate support for the radiotap and prism headers in PCAP traces, the interface for promiscuos mode sniff in the wifi device was changed. The new implementation was heavily inspired by the way the madwifi driver handles monitor mode. A distinction between TX and RX events is introduced, to account for the fact that different information is to be put in the radiotap/prism header (e.g., RSSI and noise make sense only for RX packets). The following are the relevant modifications to the WifiPhy class: 

    --  void NotifyPromiscSniff (Ptr packet);
-+  void NotifyPromiscSniffRx (Ptr packet, uint16_t channelFreqMhz, uint32_t rate, bool isShortPreamble, double signalDbm, double noiseDbm);
-+  void NotifyPromiscSniffTx (Ptr packet, uint16_t channelFreqMhz, uint32_t rate, bool isShortPreamble);
--  TracedCallback > m_phyPromiscSnifferTrace;
-+  TracedCallback, uint16_t, uint32_t, bool, double, double> m_phyPromiscSniffRxTrace;
-+  TracedCallback, uint16_t, uint32_t, bool> m_phyPromiscSniffTxTrace;
+-  void NotifyPromiscSniff (Ptr<const Packet> packet);
++  void NotifyPromiscSniffRx (Ptr<const Packet> packet, uint16_t channelFreqMhz, uint32_t rate, bool isShortPreamble, double signalDbm, double noiseDbm);
++  void NotifyPromiscSniffTx (Ptr<const Packet> packet, uint16_t channelFreqMhz, uint32_t rate, bool isShortPreamble);
+-  TracedCallback<Ptr<const Packet> > m_phyPromiscSnifferTrace;
++  TracedCallback<Ptr<const Packet>, uint16_t, uint32_t, bool, double, double> m_phyPromiscSniffRxTrace;
++  TracedCallback<Ptr<const Packet>, uint16_t, uint32_t, bool> m_phyPromiscSniffTxTrace;
    The above mentioned callbacks are expected to be used to call the following method to write Wifi PCAP traces in promiscuous mode: 
    -+  void WriteWifiMonitorPacket(Ptr packet, uint16_t channelFreqMhz, uint32_t rate, bool isShortPreamble, bool isTx, double signalDbm, double noiseDbm);
++  void WriteWifiMonitorPacket(Ptr<const Packet> packet, uint16_t channelFreqMhz, uint32_t rate, bool isShortPreamble, bool isTx, double signalDbm, double noiseDbm);
    In the above method, the isTx parameter is to be used to differentiate between TX and RX packets. For an example of how to implement these callbacks, see the implementation of PcapSniffTxEvent and PcapSniffRxEvent in src/helper/yans-wifi-helper.cc

    @@ -181,18 +181,18 @@ the general nature of these calls (synchronous routing lookup for locally originated packets, and an asynchronous, callback-based lookup for forwarded packets) is still the same. 
    --  typedef Callback<void, bool, const Ipv4Route&, Ptr<Packet>, const Ipv4Header&> RouteReplyCallback;
-+  typedef Callback<void, Ptr<Ipv4Route>, Ptr<const Packet>, const Ipv4Header &> UnicastForwardCallback;
-+  typedef Callback<void, Ptr<Ipv4MulticastRoute>, Ptr<const Packet>, const Ipv4Header &> MulticastForwardCallback;
-+  typedef Callback<void, Ptr<const Packet>, const Ipv4Header &, uint32_t > LocalDeliverCallback;
-+  typedef Callback<void, Ptr<const Packet>, const Ipv4Header &> ErrorCallback;
--  virtual bool RequestInterface (Ipv4Address destination, uint32_t& interface) = 0;
-+  virtual Ptr<Ipv4Route> RouteOutput (Ptr<Packet> p, const Ipv4Header &header, uint32_t oif, Socket::SocketErrno &errno) = 0;
+-  typedef Callback<void, bool, const Ipv4Route&, Ptr<Packet>, const Ipv4Header&> RouteReplyCallback;
++  typedef Callback<void, Ptr<Ipv4Route>, Ptr<const Packet>, const Ipv4Header &> UnicastForwardCallback;
++  typedef Callback<void, Ptr<Ipv4MulticastRoute>, Ptr<const Packet>, const Ipv4Header &> MulticastForwardCallback;
++  typedef Callback<void, Ptr<const Packet>, const Ipv4Header &, uint32_t > LocalDeliverCallback;
++  typedef Callback<void, Ptr<const Packet>, const Ipv4Header &> ErrorCallback;
+-  virtual bool RequestInterface (Ipv4Address destination, uint32_t& interface) = 0;
++  virtual Ptr<Ipv4Route> RouteOutput (Ptr<Packet> p, const Ipv4Header &header, uint32_t oif, Socket::SocketErrno &errno) = 0;
 -  virtual bool RequestRoute (uint32_t interface,
--                            const Ipv4Header &ipHeader,
+-                            const Ipv4Header &ipHeader,
 -                            Ptr<Packet> packet,
 -                            RouteReplyCallback routeReply) = 0;
-+  virtual bool RouteInput  (Ptr<const Packet> p, const Ipv4Header &header, Ptr<const NetDevice> idev,
++  virtual bool RouteInput  (Ptr<const Packet> p, const Ipv4Header &header, Ptr<const NetDevice> idev,
 +                             UnicastForwardCallback ucb, MulticastForwardCallback mcb,
 +                             LocalDeliverCallback lcb, ErrorCallback ecb) = 0;
    @@ -242,16 +242,16 @@ to an Ipv4 interface are instead named "interface". - static const uint32_t Ipv4RoutingProtocol::IF_INDEX_ANY = 0xffffffff; + static const uint32_t Ipv4RoutingProtocol::INTERFACE_ANY = 0xffffffff; -- bool Ipv4RoutingProtocol::RequestIfIndex (Ipv4Address destination, uint32_t& ifIndex); -+ bool Ipv4RoutingProtocol::RequestInterface (Ipv4Address destination, uint32_t& interface); +- bool Ipv4RoutingProtocol::RequestIfIndex (Ipv4Address destination, uint32_t& ifIndex); ++ bool Ipv4RoutingProtocol::RequestInterface (Ipv4Address destination, uint32_t& interface); (N.B. this particular function is planned to be renamed to RouteOutput() in the proposed IPv4 routing refactoring) - uint32_t Ipv4::GetIfIndexByAddress (Ipv4Address addr, Ipv4Mask mask); + int_32t Ipv4::GetInterfaceForAddress (Ipv4Address address, Ipv4Mask mask) const; -- bool Ipv4::GetIfIndexForDestination (Ipv4Address dest, uint32_t &ifIndex) const; -+ bool Ipv4::GetInterfaceForDestination (Ipv4Address dest, uint32_t &interface) const; +- bool Ipv4::GetIfIndexForDestination (Ipv4Address dest, uint32_t &ifIndex) const; ++ bool Ipv4::GetInterfaceForDestination (Ipv4Address dest, uint32_t &interface) const; (N.B. this function is not needed in the proposed Ipv4 routing refactoring) @@ -269,13 +269,13 @@ proposed IPv4 routing refactoring)
  • Regarding legacy API usage, typically where you once did the following, using the public Ipv4 class interface (e.g.): 
    -  ipv4A->SetAddress (ifIndexA, Ipv4Address ("172.16.1.1"));
-  ipv4A->SetNetworkMask (ifIndexA, Ipv4Mask ("255.255.255.255"));
+  ipv4A->SetAddress (ifIndexA, Ipv4Address ("172.16.1.1"));
+  ipv4A->SetNetworkMask (ifIndexA, Ipv4Mask ("255.255.255.255"));
    you now do: 
       Ipv4InterfaceAddress ipv4IfAddrA = Ipv4InterfaceAddress (Ipv4Address ("172.16.1.1"), Ipv4Mask ("255.255.255.255"));
-  ipv4A->AddAddress (ifIndexA, ipv4IfAddrA);
+  ipv4A->AddAddress (ifIndexA, ipv4IfAddrA);
  • At the helper API level, one often gets an address from an interface container. We preserve the legacy GetAddress (uint32_t i) but it @@ -293,16 +293,16 @@ Ipv4Address Ipv4InterfaceContainer::GetAddress (uint32_t i)
  • New WifiMacHelper objects

    The type of wifi MAC is now set by two new specific helpers, NqosWifiMacHelper for non QoS MACs and QosWifiMacHelper for Qos MACs. They are passed as argument to WifiHelper::Install methods.

    • -- void WifiHelper::SetMac (std::string type, std::string n0 = "", const AttributeValue &v0 = EmptyAttributeValue (),...)
+- void WifiHelper::SetMac (std::string type, std::string n0 = "", const AttributeValue &v0 = EmptyAttributeValue (),...)
 
-- NetDeviceContainer WifiHelper::Install (const WifiPhyHelper &phyHelper, NodeContainer c) const
-+ NetDeviceContainer WifiHelper::Install (const WifiPhyHelper &phyHelper, const WifiMacHelper &macHelper, NodeContainer c) const
+- NetDeviceContainer WifiHelper::Install (const WifiPhyHelper &phyHelper, NodeContainer c) const
++ NetDeviceContainer WifiHelper::Install (const WifiPhyHelper &phyHelper, const WifiMacHelper &macHelper, NodeContainer c) const
 
-- NetDeviceContainer WifiHelper::Install (const WifiPhyHelper &phy, Ptr<Node> node) const
-+ NetDeviceContainer WifiHelper::Install (const WifiPhyHelper &phy, const WifiMacHelper &mac, Ptr<Node> node) const
+- NetDeviceContainer WifiHelper::Install (const WifiPhyHelper &phy, Ptr<Node> node) const
++ NetDeviceContainer WifiHelper::Install (const WifiPhyHelper &phy, const WifiMacHelper &mac, Ptr<Node> node) const
 
-- NetDeviceContainer WifiHelper::Install (const WifiPhyHelper &phy, std::string nodeName) const
-+ NetDeviceContainer WifiHelper::Install (const WifiPhyHelper &phy, const WifiMacHelper &mac, std::string nodeName) const
+- NetDeviceContainer WifiHelper::Install (const WifiPhyHelper &phy, std::string nodeName) const
++ NetDeviceContainer WifiHelper::Install (const WifiPhyHelper &phy, const WifiMacHelper &mac, std::string nodeName) const
    See src/helper/nqos-wifi-mac-helper.h and src/helper/qos-wifi-mac-helper.h for more details.

    @@ -334,7 +334,7 @@ the regression tests.

    New API:

    " << std::endl << "*/" << std::endl; From db1bc136af1d27f92f1cff8aa35738b767f99d21 Mon Sep 17 00:00:00 2001 From: Mathieu Lacage Date: Thu, 2 Jul 2009 15:33:27 +0200 Subject: [PATCH 07/46] use the new global value anchors to reference RngSeed and RndRun --- src/core/random-variable.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/core/random-variable.h b/src/core/random-variable.h index 3f102dcb4..715309eff 100644 --- a/src/core/random-variable.h +++ b/src/core/random-variable.h @@ -115,9 +115,8 @@ public: * NS-3 has a rich set of random number generators. * Class RandomVariable defines the base class functionalty * required for all random number generators. By default, the underlying - * generator is seeded with the time of day, and then deterministically - * creates a sequence of seeds for each subsequent generator that is created. - * The rest of the documentation outlines how to change this behavior. + * generator is seeded all the time with the same seed value and run number + * coming from the ns3::GlobalValue \ref GlobalValueRngSeed "RngSeed" and \ref GlobalValueRngRun "RngRun". */ class RandomVariable { From 3da4a8e2418121565c9ae1f6f412b7adb44a017a Mon Sep 17 00:00:00 2001 From: Mathieu Lacage Date: Thu, 2 Jul 2009 16:33:35 +0200 Subject: [PATCH 08/46] add file to avoid stupid warning. --- doc/doxygen.conf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/doxygen.conf b/doc/doxygen.conf index 1460ba842..d4e391e58 100644 --- a/doc/doxygen.conf +++ b/doc/doxygen.conf @@ -514,7 +514,8 @@ INPUT_ENCODING = UTF-8 # *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.py *.f90 FILE_PATTERNS = *.h \ - *.tcc + *.tcc \ + node-list.cc # The RECURSIVE tag can be used to turn specify whether or not subdirectories # should be searched for input files as well. Possible values are YES and NO. From 138b79f906e2667856565d39703b927cfaa0e4cd Mon Sep 17 00:00:00 2001 From: Mathieu Lacage Date: Thu, 2 Jul 2009 16:38:53 +0200 Subject: [PATCH 09/46] get rid of some doxygen warnings --- src/applications/udp-echo/udp-echo-client.h | 10 +++++----- src/common/pcap-writer.h | 2 +- src/devices/wifi/wifi-phy.h | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/applications/udp-echo/udp-echo-client.h b/src/applications/udp-echo/udp-echo-client.h index 05569946e..c8514640b 100644 --- a/src/applications/udp-echo/udp-echo-client.h +++ b/src/applications/udp-echo/udp-echo-client.h @@ -51,7 +51,7 @@ public: * to the server). The contents of the data are set to unspecified (don't * care) by this call. * - * \warn If you have set the fill data for the echo client using one of the + * \warning If you have set the fill data for the echo client using one of the * SetFill calls, this will undo those effects. * * \param dataSize The size of the echo data you want to sent. @@ -61,7 +61,7 @@ public: /** * Get the number of data bytes that will be sent to the server. * - * \warn The number of bytes may be modified by calling any one of the + * \warning The number of bytes may be modified by calling any one of the * SetFill methods. If you have called SetFill, then the number of * data bytes will correspond to the size of an initialized data buffer. * If you have not called a SetFill method, the number of data bytes will @@ -75,7 +75,7 @@ public: * Set the data fill of the packet (what is sent as data to the server) to * the zero-terminated contents of the fill string string. * - * \warn The size of resulting echo packets will be automatically adjusted + * \warning The size of resulting echo packets will be automatically adjusted * to reflect the size of the fill string -- this means that the PacketSize * attribute may be changed as a result of this call. * @@ -88,7 +88,7 @@ public: * the repeated contents of the fill byte. i.e., the fill byte will be * used to initialize the contents of the data packet. * - * \warn The size of resulting echo packets will be automatically adjusted + * \warning The size of resulting echo packets will be automatically adjusted * to reflect the dataSize parameter -- this means that the PacketSize * attribute may be changed as a result of this call. * @@ -105,7 +105,7 @@ public: * accomplished by setting the fillSize set to your desired dataSize * (and providing an appropriate buffer). * - * \warn The size of resulting echo packets will be automatically adjusted + * \warning The size of resulting echo packets will be automatically adjusted * to reflect the dataSize parameter -- this means that the PacketSize * attribute of the Application may be changed as a result of this call. * diff --git a/src/common/pcap-writer.h b/src/common/pcap-writer.h index 08e4153b4..d99754915 100644 --- a/src/common/pcap-writer.h +++ b/src/common/pcap-writer.h @@ -118,7 +118,7 @@ public: * on a nearby channel. * @param rate the PHY data rate in units of 500kbps (i.e., the same * units used both for the radiotap and for the prism header) - * @param isPreambleShort true if short preamble is used, false otherwise + * @param isShortPreamble true if short preamble is used, false otherwise * @param isTx true if packet is being transmitted, false when * packet is being received * @param signalDbm signal power in dBm diff --git a/src/devices/wifi/wifi-phy.h b/src/devices/wifi/wifi-phy.h index 9fb67a90a..e061827a9 100644 --- a/src/devices/wifi/wifi-phy.h +++ b/src/devices/wifi/wifi-phy.h @@ -309,7 +309,7 @@ public: * on a nearby channel. * @param rate the PHY data rate in units of 500kbps (i.e., the same * units used both for the radiotap and for the prism header) - * @param isPreambleShort true if short preamble is used, false otherwise + * @param isShortPreamble true if short preamble is used, false otherwise * @param signalDbm signal power in dBm * @param noiseDbm noise power in dBm */ @@ -331,7 +331,7 @@ public: * on a nearby channel. * @param rate the PHY data rate in units of 500kbps (i.e., the same * units used both for the radiotap and for the prism header) - * @param isPreambleShort true if short preamble is used, false otherwise + * @param isShortPreamble true if short preamble is used, false otherwise */ void NotifyPromiscSniffTx (Ptr packet, uint16_t channelFreqMhz, uint32_t rate, bool isShortPreamble); From 6f9dada4303eb1b853065053887923d6f684f527 Mon Sep 17 00:00:00 2001 From: Tom Henderson Date: Thu, 2 Jul 2009 21:57:00 -0700 Subject: [PATCH 10/46] some fixes to the manual for IPv4 refactoring --- doc/manual/node.texi | 135 +++++++++++++++++----------------------- doc/manual/routing.texi | 16 +++-- 2 files changed, 69 insertions(+), 82 deletions(-) diff --git a/doc/manual/node.texi b/doc/manual/node.texi index 61fbf727f..a79694df6 100644 --- a/doc/manual/node.texi +++ b/doc/manual/node.texi @@ -121,86 +121,74 @@ ARP, UDP, TCP, and other related protocols. Internet Nodes are not subclasses of class Node; they are simply Nodes that have had a bunch of IPv4-related objects aggregated to them. They can be put together by hand, or -via a helper function @code{AddInternetStack ()} which does the -following: +via a helper function @code{InternetStackHelper::Install ()} which does the +following to all nodes passed in as arguments: @verbatim -void AddInternetStack (Ptr node) +void +InternetStackHelper::Install (Ptr node) const { - // Create layer-3 protocols - Ptr ipv4 = CreateObject (); - Ptr arp = CreateObject (); - ipv4->SetNode (node); - arp->SetNode (node); + if (node->GetObject () != 0) + { + NS_FATAL_ERROR ("InternetStackHelper::Install(): Aggregating " + "an InternetStack to a node with an existing Ipv4 object"); + return; + } - // Create an L4 demux - Ptr ipv4L4Demux = CreateObject (); + CreateAndAggregateObjectFromTypeId (node, "ns3::ArpL3Protocol"); + CreateAndAggregateObjectFromTypeId (node, "ns3::Ipv4L3Protocol"); + CreateAndAggregateObjectFromTypeId (node, "ns3::Icmpv4L4Protocol"); + CreateAndAggregateObjectFromTypeId (node, "ns3::UdpL4Protocol"); + node->AggregateObject (m_tcpFactory.Create ()); + Ptr factory = CreateObject (); + node->AggregateObject (factory); + // Set routing + Ptr ipv4 = node->GetObject (); + Ptr ipv4Routing = m_routing->Create (node); + ipv4->SetRoutingProtocol (ipv4Routing); +} +@end verbatim - // Create transport protocols and insert them into the demux - Ptr udp = CreateObject (); - Ptr tcp = CreateObject (); - - ipv4L4Demux->SetNode (node); - udp->SetNode (node); - tcp->SetNode (node); - - ipv4L4Demux->Insert (udp); - ipv4L4Demux->Insert (tcp); - - // Add factories for instantiating transport protocol sockets - Ptr udpFactory = CreateObject (); - Ptr tcpFactory = CreateObject (); - Ptr ipv4Impl = CreateObject (); - - udpFactory->SetUdp (udp); - tcpFactory->SetTcp (tcp); - ipv4Impl->SetIpv4 (ipv4); - - // Aggregate all of these new objects to the node - node->AggregateObject (ipv4); - node->AggregateObject (arp); - node->AggregateObject (ipv4Impl); - node->AggregateObject (udpFactory); - node->AggregateObject (tcpFactory); - node->AggregateObject (ipv4L4Demux); +Note that the Ipv4 routing protocol is configured and set outside this +function. By default, the following protocols are added to Ipv4: +@verbatim +InternetStackHelper::InternetStackHelper () +{ + SetTcp ("ns3::TcpL4Protocol"); + static Ipv4StaticRoutingHelper staticRouting; + static Ipv4GlobalRoutingHelper globalRouting; + static Ipv4ListRoutingHelper listRouting; + listRouting.Add (staticRouting, 0); + listRouting.Add (globalRouting, -10); + SetRoutingHelper (listRouting); } @end verbatim @subsection Internet Node structure -The Internet Node (an ns-3 Node augmented by aggregation to have one or more +An IPv4-capable Node (an ns-3 Node augmented by aggregation to have one or more IP stacks) has the following internal structure. @subsubsection Layer-3 protocols At the lowest layer, sitting above the NetDevices, are the "layer 3" -protocols, including IPv4, IPv6, and ARP. These protocols provide -the following key methods and data members: +protocols, including IPv4, IPv6 (in the future), and ARP. The +@code{class Ipv4L3Protocol} is an +implementation class whose public interface is +typically @code{class Ipv4} (found in src/node directory), but the +Ipv4L3Protocol public API is also used internally in the +src/internet-stack directory at present. +In class Ipv4L3Protocol, one method described below is @code{Receive ()}: @verbatim -class Ipv4L3Protocol : public Object -{ -public: - // Add an Ipv4 interface corresponding to the provided NetDevice - uint32_t AddInterface (Ptr device); - - // Receive function that can be bound to a callback, for receiving - // packets up the stack - void Receive( Ptr device, Ptr p, uint16_t protocol, - const Address &from); - - // Higher-level layers call this method to send a packet - // down the stack to the MAC and PHY layers - // - void Send (Ptr packet, Ipv4Address source, - Ipv4Address destination, uint8_t protocol); - -private: - Ipv4InterfaceList m_interfaces; - - // Protocol handlers -} + /** + * Lower layer calls this method after calling L3Demux::Lookup + * The ARP subclass needs to know from which NetDevice this + * packet is coming to: + * - implement a per-NetDevice ARP cache + * - send back arp replies on the right device + */ + void Receive( Ptr device, Ptr p, uint16_t protocol, const Address &from, + const Address &to, NetDevice::PacketType packetType); @end verbatim -There are many more functions (such as @code{Forward ()}) but we will -focus on the above four items from an architectural perspective. First, note that the @code{Receive ()} function has a matching signature to the ReceiveCallback in the @code{class Node}. This function pointer @@ -228,24 +216,15 @@ to send down to the Ipv4L3Protocol object can call This class nicely demonstrates two techniques we exploit in ns-3 to bind objects together: callbacks, and object aggregation. -Once IPv4 has determined that a packet is for the local node, it +Once IPv4 routing has determined that a packet is for the local node, it forwards it up the stack. This is done with the following function: @verbatim void -Ipv4L3Protocol::ForwardUp (Ptr p, Ipv4Header const&ip, - Ptr incomingInterface) -{ - NS_LOG_FUNCTION (this << p << &ip); - - Ptr demux = m_node->GetObject (); - Ptr protocol = demux->GetProtocol (ip.GetProtocol ()); - protocol->Receive (p, ip.GetSource (), ip.GetDestination (), incomingInterface); -} +Ipv4L3Protocol::LocalDeliver (Ptr packet, Ipv4Header const&ip, uint32_t iif) @end verbatim -The first step is to find the aggregated Ipv4L4Demux object. Then, this -object is consulted to look up the right Ipv4L4Protocol, based on IP protocol +The first step is to find the right Ipv4L4Protocol object , based on IP protocol number. For instance, TCP is registered in the demux as protocol number 6. Finally, the @code{Receive()} function on the Ipv4L4Protocol (such as @code{TcpL4Protocol::Receive} is called. @@ -321,10 +300,10 @@ addressing tuple (local port, local address, destination port, destination address) associated with the socket, and a receive callback for the socket. @end itemize -@subsection Internet Node interfaces +@subsection Ipv4-capable node interfaces Many of the implementation details, or internal objects themselves, -of Internet Node objects are not exposed at the simulator public +of Ipv4-capable Node objects are not exposed at the simulator public API. This allows for different implementations; for instance, replacing the native ns-3 models with ported TCP/IP stack code. diff --git a/doc/manual/routing.texi b/doc/manual/routing.texi index b96998fd1..733989df5 100644 --- a/doc/manual/routing.texi +++ b/doc/manual/routing.texi @@ -106,18 +106,26 @@ reduce computations and runtime performance. Presently, global centralized IPv4 unicast routing over both point-to-point and shared (CSMA) links is supported. +By default, when using the ns-3 helper API and the default InternetStackHelper, +global routing capability will be added to the node, and global routing +will be inserted as a routing protocol with lower priority than the +static routes (i.e., users can insert routes via Ipv4StaticRouting API +and they will take precedence over routes found by global routing). + @subsection Global Unicast Routing API The public API is very minimal. User scripts include the following: @verbatim -#include "ns3/global-route-manager.h" +#include "ns3/helper-module.h" @end verbatim +If the default InternetStackHelper is used, then an instance of +global routing will be aggregated to each node. After IP addresses are configured, the following function call will cause all of the nodes that have an Ipv4 interface to receive forwarding tables entered automatically by the GlobalRouteManager: @verbatim - GlobalRouteManager::PopulateRoutingTables (); + Ipv4GlobalRoutingHelper::PopulateRoutingTables (); @end verbatim @emph{Note:} A reminder that the wifi NetDevice will work but does not @@ -127,7 +135,7 @@ OLSR dynamic routing described below. It is possible to call this function again in the midst of a simulation using the following additional public function: @verbatim - GlobalRouteManager::RecomputeRoutingTables (); + Ipv4GlobalRoutingHelper::RecomputeRoutingTables (); @end verbatim which flushes the old tables, queries the nodes for new interface information, and rebuilds the routes. @@ -135,7 +143,7 @@ and rebuilds the routes. For instance, this scheduling call will cause the tables to be rebuilt at time 5 seconds: @verbatim - Simulator::Schedule (Seconds (5),&GlobalRouteManager::RecomputeRoutingTables); + Simulator::Schedule (Seconds (5),&Ipv4GlobalRoutingHelper::RecomputeRoutingTables); @end verbatim @subsection Global Routing Implementation From 46a5e35038472a153897202a5640aaf96953ec9d Mon Sep 17 00:00:00 2001 From: Tom Henderson Date: Thu, 2 Jul 2009 22:10:38 -0700 Subject: [PATCH 11/46] fix internet-stack figures --- doc/manual/figures/internet-node-recv.dia | Bin 3427 -> 3597 bytes doc/manual/figures/internet-node-send.dia | Bin 3352 -> 3206 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/doc/manual/figures/internet-node-recv.dia b/doc/manual/figures/internet-node-recv.dia index 9343476177461ffab68b06c5faf4057e79638d25..5f9bdfc2f3e0760804ab5829a481e38718448a16 100644 GIT binary patch literal 3597 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 T-*FyI-}e3wt30?VVb1^nGDhZh literal 3427 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 F004S#f~Nog diff --git a/doc/manual/figures/internet-node-send.dia b/doc/manual/figures/internet-node-send.dia index 602a4bf31b71b110e796f3c156eff33174c391cd..3ab41e6547314435cb9a23783eae6a9fbef35d36 100644 GIT binary patch literal 3206 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 literal 3352 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 From 3ce8fe78e71fafcab6b927325d6359bf57f4896c Mon Sep 17 00:00:00 2001 From: Tom Henderson Date: Thu, 2 Jul 2009 22:36:44 -0700 Subject: [PATCH 12/46] fix internet-stack figures --- doc/manual/figures/internet-node-recv.dia | Bin 3427 -> 3597 bytes doc/manual/figures/internet-node-send.dia | Bin 3352 -> 3206 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/doc/manual/figures/internet-node-recv.dia b/doc/manual/figures/internet-node-recv.dia index 9343476177461ffab68b06c5faf4057e79638d25..5f9bdfc2f3e0760804ab5829a481e38718448a16 100644 GIT binary patch literal 3597 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 T-*FyI-}e3wt30?VVb1^nGDhZh literal 3427 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 F004S#f~Nog diff --git a/doc/manual/figures/internet-node-send.dia b/doc/manual/figures/internet-node-send.dia index 602a4bf31b71b110e796f3c156eff33174c391cd..3ab41e6547314435cb9a23783eae6a9fbef35d36 100644 GIT binary patch literal 3206 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 literal 3352 zcmV+z4d?P7iwFP!000001MOX1bKAHTeb=wxC@Tu0-$6|qHIYdw9y8h$ z_8p#$@^O+)-uJ(L`So4c|K&sP=W!CB!@o%x&m8zhR>|Mq_oqS>=VxaR4-Y7PtYVRu zC{5<5;%EPh(=o7NSgU=7Kv}Jmc^CH}U9hQs(n)+}Ew@ zcB4GaOXogL-}m3#s-ON@-ObrbKQHuM#1no~^7w9h*Dm}-(IH(Iyj<^gR^(LzO~hld z(PT?M^1sj8)U7ILlubUox$xfTA=Mu|_0=@ctsr6+my;yh#DTd<^+XU95<*}ySQJKX z;01UwC;P+Q92YJA~qp!@;v2nrcp&X=ZE7|qc{Z@d&#U8R@^2+ z;AEu?$@u5V(+J~xAX?x+t%e_9CF6l{>#H;o{V|*ikq#r+0xUrZg%$CtgpA*bz<~K zYm2plNaIId*4_W*X_G{YD*uY1)9nk6;zGKuL0t6ZI zB%AT(tNG;jyPDIuLhs2ZX;NHI^D_Azd?`*}4EDABdT$t5!=)#-2hktuWMOOe01NRr zF2|5Ue39|InL*&T8H9(zRp0A8fshEW?6P5qFhH^IpYtw?B86)#V5TkonWn!D2mCXT zpKE~pb|Q=y!uXTPuG;&VQ_JR8Wkfo3gi>D8excpC!t2Jyia8=atI?!hUV2sgEv|=VoHtp z-IPUec#OIT4xS1l#63!3q=jKtjaW5e)reIir&t+@Y-PlXkpsj?(193{t8RptVKJgn z+@%io{w|Aq?}}PAazr(<>5f*7m{KEQdo{wOHXz6|t48FmWk8`)jbMq$kZV|t zv^31B5vxY58nJ5RvHnn3qQKL|~QA_>5ER&qT zS&_1kg5)w2yu6J^+|r?GI&5@Et4B=f5!}HcbtM&i6fm;~)jgtNTn3WFm6#FoTxM32 zw6)EO5-UoqD6yjCqG6B>Xp}Uwd4tghC}S@qCm-#8Z)4$aj4|qIef#i;SoehgELxD(g}rJLB7&NA+682 zM~J8+kp}4_Lf8wuK%Gg0OnL}Vu6Z_ArtD{6qk_Rc!KxiOumTL; zGAh=`(ez57y^>)Om*P4u%lu(`o=QmT&aYFROIf6u#MB%vyFT6w zK0$Uqe;tuh(4LfBSiVAi$KMT&a+6B}U!B8X)b%7cxnbnXyRMiWft$A2*?g0Q23R#^ zmZB_0S&C{Sy~6esg_R=m%_dIzDLqW(Opu;@|AOoM{3_4y=Ed8etl~1QxEg%W$}OX` z5p|H+=tEA%vl_KejM3p@(->WO?2V-lOCOECXbHsFTbkSsipU^J@E|n%I8zDZY8bV* zHISGXAN)dxovX+#jk8r`TSc~2WLrf(y()4HLhbfeTSwkol@Q!P9a%5(uHjQN zHBO{53x?bpG&qsR6IwDnLJ_&i6Rj#SS+F6bgDSErWXQ|LjNaHFB=D7cxSlR0Q(u;n zUAfiu2&LpED;u>8#YB5?V2d@jSYwMdZStG;$9G&5$yLQiMzfnG3SmQn^-YujkyE(q z`gbla#^aJ#mGd^AiwVr##7PzpKeIPu%_lxhE^5;rqiIj;Q$70aW*7wqS;bdHK8$=e zlusj*?~pw7ImtUGIt_MhYjpS)bM!?AKZ4H& z)Tzo*VpxuDyDc5HkKS+)B6e_zXvf%tdBSqc!%7pUzGWXSJfYw7=%AaX0X*)ZE9eYWLj??#1UdL)Uk_j z=$hQKzd!)}1hC?&lKq2+$dP=yM7YE9>Z*23Fp6aUOuW%w6ibpjS&TXR6ol?^5(mriZ4;sv30b`df8VrW3 zL182-gO+1_kZ$m74DSGi7hnqvuvaV^ruifp$*U*5MSg8*gtAZiUTy!3i)lWVsFm!s zC)-bXJm%#9<{%LX5Zmuu{mmIo`RJ~i&jxB@<;ti(ua`}G*?>FVMi%+lU(vq5- zU}SRo5o-RwT=fTj|`dN(IxqKRSn&)?wGcO=kO8IE|?Zb_;UR+53D-&>F z)%WG%OdeQY0q2ak1eG2HBjMj-Igf+-qRDpz%K_$@ydn@u)x0S3QdGT*vKYVxdJdOJ zkI!mY2O6xR=?MWNS#9LAfmHGv@eQy?40Co9Ll})x2;ZTjIpIMLrbtG0D6e(hgLnWo z5%rhU<(GrjS713=@~i*2`0K*|oa9#aq=v1n0V$7oo^`s From f1d5f90af775142356a42907ec0c8dd8f5ce82b4 Mon Sep 17 00:00:00 2001 From: Mathieu Lacage Date: Fri, 3 Jul 2009 09:08:01 +0200 Subject: [PATCH 13/46] tweak doxygen --- src/helper/ipv4-list-routing-helper.h | 3 +++ src/helper/ipv4-routing-helper.h | 2 +- src/helper/ipv4-static-routing-helper.h | 3 +++ src/helper/nqos-wifi-mac-helper.h | 4 ++++ src/helper/olsr-helper.h | 3 +++ src/helper/qos-wifi-mac-helper.h | 4 ++++ 6 files changed, 18 insertions(+), 1 deletion(-) diff --git a/src/helper/ipv4-list-routing-helper.h b/src/helper/ipv4-list-routing-helper.h index 5849c6840..ef34068c7 100644 --- a/src/helper/ipv4-list-routing-helper.h +++ b/src/helper/ipv4-list-routing-helper.h @@ -28,6 +28,9 @@ namespace ns3 { /** * \brief Helper class that adds ns3::Ipv4ListRouting objects + * + * This class is expected to be used in conjunction with + * ns3::InternetStackHelper::SetRoutingHelper */ class Ipv4ListRoutingHelper : public Ipv4RoutingHelper { diff --git a/src/helper/ipv4-routing-helper.h b/src/helper/ipv4-routing-helper.h index 170052a6e..9c8a28233 100644 --- a/src/helper/ipv4-routing-helper.h +++ b/src/helper/ipv4-routing-helper.h @@ -33,7 +33,7 @@ class Node; * For each new routing protocol created as a subclass of * ns3::Ipv4RoutingProtocol, you need to create a subclass of * ns3::Ipv4RoutingHelper which can be used by - * ns3::InternetStackHelper::SetRoutingProtocol and + * ns3::InternetStackHelper::SetRoutingHelper and * ns3::InternetStackHelper::Install. */ class Ipv4RoutingHelper diff --git a/src/helper/ipv4-static-routing-helper.h b/src/helper/ipv4-static-routing-helper.h index 24a885e31..2092900e4 100644 --- a/src/helper/ipv4-static-routing-helper.h +++ b/src/helper/ipv4-static-routing-helper.h @@ -33,6 +33,9 @@ namespace ns3 { /** * \brief Helper class that adds ns3::Ipv4StaticRouting objects + * + * This class is expected to be used in conjunction with + * ns3::InternetStackHelper::SetRoutingHelper */ class Ipv4StaticRoutingHelper : public Ipv4RoutingHelper { diff --git a/src/helper/nqos-wifi-mac-helper.h b/src/helper/nqos-wifi-mac-helper.h index 9800b6082..ae67b1922 100644 --- a/src/helper/nqos-wifi-mac-helper.h +++ b/src/helper/nqos-wifi-mac-helper.h @@ -24,6 +24,10 @@ namespace ns3 { +/** + * \brief create non-qos MAC layers for a ns3::WifiNetDevice. + * This class can create MACs of type ns3::NqapWifiMac, ns3::NqstaWifiMac, and, ns3::AdhocWifiMac + */ class NqosWifiMacHelper : public WifiMacHelper { public: diff --git a/src/helper/olsr-helper.h b/src/helper/olsr-helper.h index 0856abf97..7a40044d7 100644 --- a/src/helper/olsr-helper.h +++ b/src/helper/olsr-helper.h @@ -29,6 +29,9 @@ namespace ns3 { /** * \brief Helper class that adds OLSR routing to nodes. + * + * This class is expected to be used in conjunction with + * ns3::InternetStackHelper::SetRoutingHelper */ class OlsrHelper : public Ipv4RoutingHelper { diff --git a/src/helper/qos-wifi-mac-helper.h b/src/helper/qos-wifi-mac-helper.h index ea2c6fdcc..32537283a 100644 --- a/src/helper/qos-wifi-mac-helper.h +++ b/src/helper/qos-wifi-mac-helper.h @@ -27,6 +27,10 @@ namespace ns3 { +/** + * \brief create qos MAC layers for a ns3::WifiNetDevice. + * This class can create MACs of type ns3::QapWifiMac, ns3::QstaWifiMac, and, ns3::QadhocWifiMac + */ class QosWifiMacHelper : public WifiMacHelper { public: From 4884b6da1f8dbd55063d827ae2de60a60e1d2dba Mon Sep 17 00:00:00 2001 From: "Gustavo J. A. M. Carneiro" Date: Fri, 3 Jul 2009 11:17:38 +0100 Subject: [PATCH 14/46] =?UTF-8?q?Fix=20the=20virtual-net-device.cc=20examp?= =?UTF-8?q?le;=20thanks=20Antti=20M=C3=A4kel=C3=A4.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- examples/virtual-net-device.cc | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/examples/virtual-net-device.cc b/examples/virtual-net-device.cc index aa65a13bf..cde18bc7e 100644 --- a/examples/virtual-net-device.cc +++ b/examples/virtual-net-device.cc @@ -78,23 +78,29 @@ class Tunnel bool - N0N1VirtualSend (Ptr packet, const Address& source, const Address& dest, uint16_t protocolNumber) + N0VirtualSend (Ptr packet, const Address& source, const Address& dest, uint16_t protocolNumber) { - m_n3Socket->SendTo (packet, 0, InetSocketAddress (m_n3Address, 667)); + m_n0Socket->SendTo (packet, 0, InetSocketAddress (m_n3Address, 667)); + return true; + } + + bool + N1VirtualSend (Ptr packet, const Address& source, const Address& dest, uint16_t protocolNumber) + { + m_n1Socket->SendTo (packet, 0, InetSocketAddress (m_n3Address, 667)); return true; } bool N3VirtualSend (Ptr packet, const Address& source, const Address& dest, uint16_t protocolNumber) { - if (m_rng.GetValue () < 0.25) { - m_n0Socket->SendTo (packet, 0, InetSocketAddress (m_n0Address, 667)); + m_n3Socket->SendTo (packet, 0, InetSocketAddress (m_n0Address, 667)); } else { - m_n1Socket->SendTo (packet, 0, InetSocketAddress (m_n1Address, 667)); + m_n3Socket->SendTo (packet, 0, InetSocketAddress (m_n1Address, 667)); } return true; } @@ -144,7 +150,7 @@ public: // n0 tap device m_n0Tap = CreateObject (); m_n0Tap->SetAddress (Mac48Address ("11:00:01:02:03:01")); - m_n0Tap->SetSendCallback (MakeCallback (&Tunnel::N0N1VirtualSend, this)); + m_n0Tap->SetSendCallback (MakeCallback (&Tunnel::N0VirtualSend, this)); n0->AddDevice (m_n0Tap); Ptr ipv4 = n0->GetObject (); uint32_t i = ipv4->AddInterface (m_n0Tap); @@ -154,7 +160,7 @@ public: // n1 tap device m_n1Tap = CreateObject (); m_n1Tap->SetAddress (Mac48Address ("11:00:01:02:03:02")); - m_n1Tap->SetSendCallback (MakeCallback (&Tunnel::N0N1VirtualSend, this)); + m_n1Tap->SetSendCallback (MakeCallback (&Tunnel::N1VirtualSend, this)); n1->AddDevice (m_n1Tap); ipv4 = n1->GetObject (); i = ipv4->AddInterface (m_n1Tap); From 41a77b945e0b4cfa615346a85b2dc5cf2c268b60 Mon Sep 17 00:00:00 2001 From: "Gustavo J. A. M. Carneiro" Date: Fri, 3 Jul 2009 14:12:28 +0100 Subject: [PATCH 15/46] Add doxygen for BridgeHelper --- src/helper/bridge-helper.h | 50 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/src/helper/bridge-helper.h b/src/helper/bridge-helper.h index 8a4bbb859..8ebc8f65a 100644 --- a/src/helper/bridge-helper.h +++ b/src/helper/bridge-helper.h @@ -1,3 +1,23 @@ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ +/* + * Copyright (c) 2008 INRIA + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation; + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * Author: Mathieu Lacage + * Author: Gustavo Carneiro + */ #ifndef BRIDGE_HELPER_H #define BRIDGE_HELPER_H @@ -10,12 +30,42 @@ namespace ns3 { class Node; class AttributeValue; +/** + * \brief Add capability to bridge multiple LAN segments (IEEE 802.1D bridging) + */ class BridgeHelper { public: BridgeHelper (); + /** + * \param n1 the name of the attribute to set + * \param v1 the value of the attribute to set + * + * Set an attribute on each ns3::BridgeNetDevice created by + * BridgeHelper::Install + */ void SetDeviceAttribute (std::string n1, const AttributeValue &v1); + /** + * This method creates an ns3::BridgeNetDevice with the attributes + * configured by BridgeHelper::SetDeviceAttribute, adds the device + * to the node, and attaches the given NetDevices as ports of the + * bridge. + * + * \param node The node to install the device in + * \param c Container of NetDevices to add as bridge ports + * \returns A containter holding the added net device. + */ NetDeviceContainer Install (Ptr node, NetDeviceContainer c); + /** + * This method creates an ns3::BridgeNetDevice with the attributes + * configured by BridgeHelper::SetDeviceAttribute, adds the device + * to the node, and attaches the given NetDevices as ports of the + * bridge. + * + * \param nodeName The name of the node to install the device in + * \param c Container of NetDevices to add as bridge ports + * \returns A containter holding the added net device. + */ NetDeviceContainer Install (std::string nodeName, NetDeviceContainer c); private: ObjectFactory m_deviceFactory; From 1d0f46f3a373379bbcebb37ba28f0e54576421d7 Mon Sep 17 00:00:00 2001 From: Craig Dowell Date: Fri, 3 Jul 2009 08:26:52 -0700 Subject: [PATCH 16/46] updates to manual for 3.5 --- doc/manual/attributes.texi | 115 ++++++++++++++++++++++++++++++------- 1 file changed, 94 insertions(+), 21 deletions(-) diff --git a/doc/manual/attributes.texi b/doc/manual/attributes.texi index db7dcb61b..91a7340bd 100644 --- a/doc/manual/attributes.texi +++ b/doc/manual/attributes.texi @@ -114,6 +114,7 @@ example: @code{class ns3::Node}. The public header file node.h has a declaration that includes a static GetTypeId function call: + @verbatim class Node : public Object { @@ -123,21 +124,72 @@ public: @end verbatim This is defined in the node.cc file as follows: + @verbatim TypeId Node::GetTypeId (void) { static TypeId tid = TypeId ("ns3::Node") .SetParent () + .AddConstructor () + .AddAttribute ("DeviceList", "The list of devices associated to this Node.", + ObjectVectorValue (), + MakeObjectVectorAccessor (&Node::m_devices), + MakeObjectVectorChecker ()) + .AddAttribute ("ApplicationList", "The list of applications associated to this Node.", + ObjectVectorValue (), + MakeObjectVectorAccessor (&Node::m_applications), + MakeObjectVectorChecker ()) + .AddAttribute ("Id", "The id (unique integer) of this Node.", + TypeId::ATTR_GET, // allow only getting it. + UintegerValue (0), + MakeUintegerAccessor (&Node::m_id), + MakeUintegerChecker ()) ; return tid; } @end verbatim -Finally, when users want to create Nodes, they call: + +Look at the TypeId of an ns-3 @code{Object} class as an extended form of run +time type information (RTTI). The C++ language includes simple kind of RTTI +in order to support @code{dynamic_cast} and @code{typeid} operators. + +The ``@code{.SetParent ()}'' call in the declaration above is used in +conjunction with our object aggregation mechanisms to allow safe up- and +down-casing in inheritance trees during @code{GetObject}. + +The ``@code{.AddConstructor ()}'' call is used in conjunction with our +abstract object factory mechanisms to allow us to construct C++ objects without +forcing a user to know the concrete class of the object she is building. + +The three calls to ``@code{.AddAttribute}'' associate a given string with a +strongly typed value in the class. Notice that you must provide a help string +which may be displayed, for example, via command line processors. Each +@code{Attribute} is associated with mechanisms for accessing the underlying +member variable in the object (for example, @code{MakeUintegerAccessor} tells +the generic @code{Attribute} code how to get to the node ID above). There are +also ``Checker'' methods which are used to validate values. + +When users want to create Nodes, they will usually call some form of +@code{CreateObject}, + @verbatim Ptr n = CreateObject (); @end verbatim +or more abstractly, using an object factory, you can create a @code{Node} object +without even knowing the concrete C++ type + +@verbatim + ObjectFactory factory; + const std::string typeId = "ns3::Node''; + factory.SetTypeId(typeId); + Ptr node = factory.Create (); +@end verbatim + +Both of these methods result in fully initialized attributes being available +in the resulting @code{Object} instances. + We next discuss how attributes (values associated with member variables or functions of the class) are plumbed into the above TypeId. @@ -206,6 +258,7 @@ and some type of global default value. In the ns-3 attribute system, these value definitions and accessor functions are moved into the TypeId class; e.g.: + @verbatim NS_OBJECT_ENSURE_REGISTERED (DropTailQueue); @@ -358,11 +411,11 @@ Now, let's set it to another value (60 packets) @subsubsection Namespace-based access -An alternative way to get at the attribute is to use the configuration -namespace. Here, this attribute resides on a known path in this -namespace; this approach is useful if one doesn't have access to -the underlying pointers and would like to configure a specific -attribute with a single statement. +An alternative way to get at the attribute is to use the configuration namespace. +Here, this attribute resides on a known path in this namespace; this approach +is useful if one doesn't have access to the underlying pointers and would like +to configure a specific attribute with a single statement. + @verbatim Config::Set ("/NodeList/0/DeviceList/0/TxQueue/MaxPackets", UintegerValue (25)); txQueue->GetAttribute ("MaxPackets", limit); @@ -370,9 +423,8 @@ attribute with a single statement. limit.Get () << " packets"); @end verbatim -We could have also used wildcards to set this value for all nodes -and all net devices (which in this simple example has the same -effect as the previous Set()) +We could have also used wildcards to set this value for all nodes and all net +devices (which in this simple example has the same effect as the previous Set()) @verbatim Config::Set ("/NodeList/*/DeviceList/*/TxQueue/MaxPackets", UintegerValue (15)); txQueue->GetAttribute ("MaxPackets", limit); @@ -380,6 +432,22 @@ effect as the previous Set()) limit.Get () << " packets"); @end verbatim +@subsubsection Object Name Service-based access + +Another way to get at the attribute is to use the object name service facility. +Here, this attribute is found using a name string. This approach is useful if +one doesn't have access to the underlying pointers and it is difficult to +determine the required concrete configuration namespaced path. + +@verbatim + Names::Add ("server", serverNode); + Names::Add ("server/eth0", serverDevice); + + ... + + Config::Set ("/Names/server/eth0/TxQueue/MaxPackets", UintegerValue (25)); +@end verbatim + @subsection Setting through constructors helper classes Arbitrary combinations of attributes can be set and fetched from @@ -438,13 +506,13 @@ Consider this variable in class TcpSocket: Suppose that someone working with Tcp wanted to get or set the value of that variable using the metadata system. If it were not already provided by ns-3, the user could declare the following addition -in the metadata system (to the TypeId declaration for TcpSocket): +in the runtime metadata system (to the TypeId declaration for TcpSocket): @verbatim - .AddParameter ("Congestion window", + .AddAttribute ("Congestion window", "Tcp congestion window (bytes)", - Uinteger (1), + UintegerValue (1), MakeUintegerAccessor (&TcpSocket::m_cWnd), - MakeUintegerChecker ()); + MakeUintegerChecker ()) @end verbatim @@ -511,21 +579,26 @@ wants to hook it in to the attribute system, there is mainly the matter of writing the conversions to/from strings and attribute values. Most of this can be copy/pasted with macro-ized code. For instance, consider class -Rectangle in the @code{src/mobility/} directory: +delcaration for Rectangle in the @code{src/mobility/} directory: -One line is added to the class declaration: @verbatim /** * \brief a 2d rectangle */ class Rectangle { -... + ... + double xMin; + double xMax; + double yMin; + double yMax; }; @end verbatim -One macro call and two operators, are added below the class declaration: +One macro call and two operators, must be added below the class declaration +in order to turn a Rectangle into a value usable by the @code{Attribute} +system: @verbatim std::ostream &operator << (std::ostream &os, const Rectangle &rectangle); @@ -534,7 +607,7 @@ std::istream &operator >> (std::istream &is, Rectangle &rectangle); ATTRIBUTE_HELPER_HEADER (Rectangle); @end verbatim -In the class definition, the code looks like this: +In the class definition (@code{.cc} file), the code looks like this: @verbatim ATTRIBUTE_HELPER_CPP (Rectangle); @@ -568,9 +641,9 @@ of an instance of the new class. @node ConfigStore @section ConfigStore -@strong{Feedback requested:} This is an experimental feature of ns-3. -It is not in the main tree. If you like this feature and would like -to provide feedback on it, please email us. +@strong{Feedback requested:} This is an experimental feature of ns-3. It is +found in @code{src/contrib} and not in the main tree. If you like this feature +and would like to provide feedback on it, please email us. Values for ns-3 attributes can be stored in an ascii text file and loaded into a future simulation. This feature is known as the From ebc34d951b64a3176830e7b27ee243e331367e24 Mon Sep 17 00:00:00 2001 From: "Gustavo J. A. M. Carneiro" Date: Fri, 3 Jul 2009 11:17:38 +0100 Subject: [PATCH 17/46] =?UTF-8?q?Fix=20the=20virtual-net-device.cc=20examp?= =?UTF-8?q?le;=20thanks=20Antti=20M=C3=A4kel=C3=A4.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- examples/virtual-net-device.cc | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/examples/virtual-net-device.cc b/examples/virtual-net-device.cc index aa65a13bf..cde18bc7e 100644 --- a/examples/virtual-net-device.cc +++ b/examples/virtual-net-device.cc @@ -78,23 +78,29 @@ class Tunnel bool - N0N1VirtualSend (Ptr packet, const Address& source, const Address& dest, uint16_t protocolNumber) + N0VirtualSend (Ptr packet, const Address& source, const Address& dest, uint16_t protocolNumber) { - m_n3Socket->SendTo (packet, 0, InetSocketAddress (m_n3Address, 667)); + m_n0Socket->SendTo (packet, 0, InetSocketAddress (m_n3Address, 667)); + return true; + } + + bool + N1VirtualSend (Ptr packet, const Address& source, const Address& dest, uint16_t protocolNumber) + { + m_n1Socket->SendTo (packet, 0, InetSocketAddress (m_n3Address, 667)); return true; } bool N3VirtualSend (Ptr packet, const Address& source, const Address& dest, uint16_t protocolNumber) { - if (m_rng.GetValue () < 0.25) { - m_n0Socket->SendTo (packet, 0, InetSocketAddress (m_n0Address, 667)); + m_n3Socket->SendTo (packet, 0, InetSocketAddress (m_n0Address, 667)); } else { - m_n1Socket->SendTo (packet, 0, InetSocketAddress (m_n1Address, 667)); + m_n3Socket->SendTo (packet, 0, InetSocketAddress (m_n1Address, 667)); } return true; } @@ -144,7 +150,7 @@ public: // n0 tap device m_n0Tap = CreateObject (); m_n0Tap->SetAddress (Mac48Address ("11:00:01:02:03:01")); - m_n0Tap->SetSendCallback (MakeCallback (&Tunnel::N0N1VirtualSend, this)); + m_n0Tap->SetSendCallback (MakeCallback (&Tunnel::N0VirtualSend, this)); n0->AddDevice (m_n0Tap); Ptr ipv4 = n0->GetObject (); uint32_t i = ipv4->AddInterface (m_n0Tap); @@ -154,7 +160,7 @@ public: // n1 tap device m_n1Tap = CreateObject (); m_n1Tap->SetAddress (Mac48Address ("11:00:01:02:03:02")); - m_n1Tap->SetSendCallback (MakeCallback (&Tunnel::N0N1VirtualSend, this)); + m_n1Tap->SetSendCallback (MakeCallback (&Tunnel::N1VirtualSend, this)); n1->AddDevice (m_n1Tap); ipv4 = n1->GetObject (); i = ipv4->AddInterface (m_n1Tap); From 6bdfdc8dc53be254b9ccf99218ad97c0029e3e86 Mon Sep 17 00:00:00 2001 From: Nicola Baldo Date: Fri, 3 Jul 2009 13:43:43 +0200 Subject: [PATCH 18/46] implemented GlobalValue::GetValueByName () --- src/core/global-value.cc | 24 ++++++++++++++++++++++++ src/core/global-value.h | 24 ++++++++++++++++++++++++ 2 files changed, 48 insertions(+) diff --git a/src/core/global-value.cc b/src/core/global-value.cc index 70a226e55..506fb11b8 100644 --- a/src/core/global-value.cc +++ b/src/core/global-value.cc @@ -174,6 +174,30 @@ GlobalValue::End (void) { return GetVector ()->end (); } + +bool +GlobalValue::GetValueByNameFailSafe (std::string name, AttributeValue &value) +{ + for (GlobalValue::Iterator gvit = GlobalValue::Begin (); gvit != GlobalValue::End (); ++gvit) + { + if ((*gvit)->GetName () == name) + { + (*gvit)->GetValue (value); + return true; + } + } + return false; // not found +} + +void +GlobalValue::GetValueByName (std::string name, AttributeValue &value) +{ + if (! GetValueByNameFailSafe (name, value)) + { + NS_FATAL_ERROR ("Could not find GlobalValue named \"" << name << "\""); + } +} + GlobalValue::Vector * GlobalValue::GetVector (void) { diff --git a/src/core/global-value.h b/src/core/global-value.h index a40d2244f..c744247dd 100644 --- a/src/core/global-value.h +++ b/src/core/global-value.h @@ -114,6 +114,30 @@ public: * \returns an iterator which represents a pointer to the last GlobalValue registered. */ static Iterator End (void); + + + /** + * finds the GlobalValue with the given name and returns its value + * + * @param name the name of the GlobalValue to be found + * @param value where to store the value of the found GlobalValue + * + * @return true if the GlobalValue was found, false otherwise + */ + static bool GetValueByNameFailSafe (std::string name, AttributeValue &value); + + /** + * finds the GlobalValue with the given name and returns its + * value. This method cannot fail, i.e., it will trigger a + * NS_FATAL_ERROR if the requested GlobalValue is not found. + * + * @param name the name of the GlobalValue to be found + * @param value where to store the value of the found GlobalValue + * + */ + static void GetValueByName (std::string name, AttributeValue &value); + + private: friend class GlobalValueTests; static Vector *GetVector (void); From e53734ed32facf2672cb104dacbb9ecffd5f50f6 Mon Sep 17 00:00:00 2001 From: "Gustavo J. A. M. Carneiro" Date: Fri, 3 Jul 2009 14:12:28 +0100 Subject: [PATCH 19/46] Add doxygen for BridgeHelper --- src/helper/bridge-helper.h | 50 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/src/helper/bridge-helper.h b/src/helper/bridge-helper.h index 8a4bbb859..8ebc8f65a 100644 --- a/src/helper/bridge-helper.h +++ b/src/helper/bridge-helper.h @@ -1,3 +1,23 @@ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ +/* + * Copyright (c) 2008 INRIA + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation; + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * Author: Mathieu Lacage + * Author: Gustavo Carneiro + */ #ifndef BRIDGE_HELPER_H #define BRIDGE_HELPER_H @@ -10,12 +30,42 @@ namespace ns3 { class Node; class AttributeValue; +/** + * \brief Add capability to bridge multiple LAN segments (IEEE 802.1D bridging) + */ class BridgeHelper { public: BridgeHelper (); + /** + * \param n1 the name of the attribute to set + * \param v1 the value of the attribute to set + * + * Set an attribute on each ns3::BridgeNetDevice created by + * BridgeHelper::Install + */ void SetDeviceAttribute (std::string n1, const AttributeValue &v1); + /** + * This method creates an ns3::BridgeNetDevice with the attributes + * configured by BridgeHelper::SetDeviceAttribute, adds the device + * to the node, and attaches the given NetDevices as ports of the + * bridge. + * + * \param node The node to install the device in + * \param c Container of NetDevices to add as bridge ports + * \returns A containter holding the added net device. + */ NetDeviceContainer Install (Ptr node, NetDeviceContainer c); + /** + * This method creates an ns3::BridgeNetDevice with the attributes + * configured by BridgeHelper::SetDeviceAttribute, adds the device + * to the node, and attaches the given NetDevices as ports of the + * bridge. + * + * \param nodeName The name of the node to install the device in + * \param c Container of NetDevices to add as bridge ports + * \returns A containter holding the added net device. + */ NetDeviceContainer Install (std::string nodeName, NetDeviceContainer c); private: ObjectFactory m_deviceFactory; From 3b71ecc23c715a1bd885f45683e60f7d4833b37a Mon Sep 17 00:00:00 2001 From: "Gustavo J. A. M. Carneiro" Date: Fri, 3 Jul 2009 16:15:06 +0100 Subject: [PATCH 20/46] More virtual-net-device.cc bug fixes --- examples/virtual-net-device.cc | 15 ++++++++++++--- src/internet-stack/ipv4-interface.cc | 2 +- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/examples/virtual-net-device.cc b/examples/virtual-net-device.cc index cde18bc7e..96a60bc20 100644 --- a/examples/virtual-net-device.cc +++ b/examples/virtual-net-device.cc @@ -80,6 +80,7 @@ class Tunnel bool N0VirtualSend (Ptr packet, const Address& source, const Address& dest, uint16_t protocolNumber) { + NS_LOG_DEBUG ("Send to " << m_n3Address << ": " << *packet); m_n0Socket->SendTo (packet, 0, InetSocketAddress (m_n3Address, 667)); return true; } @@ -87,6 +88,7 @@ class Tunnel bool N1VirtualSend (Ptr packet, const Address& source, const Address& dest, uint16_t protocolNumber) { + NS_LOG_DEBUG ("Send to " << m_n3Address << ": " << *packet); m_n1Socket->SendTo (packet, 0, InetSocketAddress (m_n3Address, 667)); return true; } @@ -96,10 +98,12 @@ class Tunnel { if (m_rng.GetValue () < 0.25) { + NS_LOG_DEBUG ("Send to " << m_n0Address << ": " << *packet); m_n3Socket->SendTo (packet, 0, InetSocketAddress (m_n0Address, 667)); } else { + NS_LOG_DEBUG ("Send to " << m_n1Address << ": " << *packet); m_n3Socket->SendTo (packet, 0, InetSocketAddress (m_n1Address, 667)); } return true; @@ -108,6 +112,7 @@ class Tunnel void N3SocketRecv (Ptr socket) { Ptr packet = socket->Recv (65535, 0); + NS_LOG_DEBUG ("N3SocketRecv: " << *packet); SocketAddressTag socketAddressTag; packet->RemovePacketTag (socketAddressTag); m_n3Tap->Receive (packet, 0x0800, m_n3Tap->GetAddress (), m_n3Tap->GetAddress (), NetDevice::PACKET_HOST); @@ -116,6 +121,7 @@ class Tunnel void N0SocketRecv (Ptr socket) { Ptr packet = socket->Recv (65535, 0); + NS_LOG_DEBUG ("N0SocketRecv: " << *packet); SocketAddressTag socketAddressTag; packet->RemovePacketTag (socketAddressTag); m_n0Tap->Receive (packet, 0x0800, m_n0Tap->GetAddress (), m_n0Tap->GetAddress (), NetDevice::PACKET_HOST); @@ -124,6 +130,7 @@ class Tunnel void N1SocketRecv (Ptr socket) { Ptr packet = socket->Recv (65535, 0); + NS_LOG_DEBUG ("N1SocketRecv: " << *packet); SocketAddressTag socketAddressTag; packet->RemovePacketTag (socketAddressTag); m_n1Tap->Receive (packet, 0x0800, m_n1Tap->GetAddress (), m_n1Tap->GetAddress (), NetDevice::PACKET_HOST); @@ -192,6 +199,8 @@ main (int argc, char *argv[]) #if 0 LogComponentEnable ("VirtualNetDeviceExample", LOG_LEVEL_INFO); #endif + Packet::EnablePrinting (); + // Set up some default values for the simulation. Use the Config::SetDefault ("ns3::OnOffApplication::PacketSize", UintegerValue (210)); @@ -266,11 +275,11 @@ main (int argc, char *argv[]) Address (InetSocketAddress (Ipv4Address::GetAny (), port))); apps = sink.Install (c.Get (3)); apps.Start (Seconds (1.0)); - apps.Stop (Seconds (10.0)); + //apps.Stop (Seconds (10.0)); // Create a similar flow from n3 to n1, starting at time 1.1 seconds onoff.SetAttribute ("Remote", - AddressValue (InetSocketAddress (Ipv4Address ("11.0.0.2"), port))); + AddressValue (InetSocketAddress (Ipv4Address ("11.0.0.1"), port))); apps = onoff.Install (c.Get (3)); apps.Start (Seconds (1.1)); apps.Stop (Seconds (10.0)); @@ -278,7 +287,7 @@ main (int argc, char *argv[]) // Create a packet sink to receive these packets apps = sink.Install (c.Get (1)); apps.Start (Seconds (1.1)); - apps.Stop (Seconds (10.0)); + //apps.Stop (Seconds (10.0)); std::ofstream ascii; ascii.open ("virtual-net-device.tr"); diff --git a/src/internet-stack/ipv4-interface.cc b/src/internet-stack/ipv4-interface.cc index 3d1779fce..67754a114 100644 --- a/src/internet-stack/ipv4-interface.cc +++ b/src/internet-stack/ipv4-interface.cc @@ -178,7 +178,7 @@ Ipv4Interface::SetForwarding (bool val) void Ipv4Interface::Send (Ptr p, Ipv4Address dest) { - NS_LOG_FUNCTION_NOARGS (); + NS_LOG_FUNCTION (dest << *p); if (!IsUp()) { return; From fefc37fb3227e6249c262acc6f3378f8377d3aee Mon Sep 17 00:00:00 2001 From: Craig Dowell Date: Fri, 3 Jul 2009 08:26:52 -0700 Subject: [PATCH 21/46] updates to manual for 3.5 --- doc/manual/attributes.texi | 115 ++++++++++++++++++++++++++++++------- 1 file changed, 94 insertions(+), 21 deletions(-) diff --git a/doc/manual/attributes.texi b/doc/manual/attributes.texi index db7dcb61b..91a7340bd 100644 --- a/doc/manual/attributes.texi +++ b/doc/manual/attributes.texi @@ -114,6 +114,7 @@ example: @code{class ns3::Node}. The public header file node.h has a declaration that includes a static GetTypeId function call: + @verbatim class Node : public Object { @@ -123,21 +124,72 @@ public: @end verbatim This is defined in the node.cc file as follows: + @verbatim TypeId Node::GetTypeId (void) { static TypeId tid = TypeId ("ns3::Node") .SetParent () + .AddConstructor () + .AddAttribute ("DeviceList", "The list of devices associated to this Node.", + ObjectVectorValue (), + MakeObjectVectorAccessor (&Node::m_devices), + MakeObjectVectorChecker ()) + .AddAttribute ("ApplicationList", "The list of applications associated to this Node.", + ObjectVectorValue (), + MakeObjectVectorAccessor (&Node::m_applications), + MakeObjectVectorChecker ()) + .AddAttribute ("Id", "The id (unique integer) of this Node.", + TypeId::ATTR_GET, // allow only getting it. + UintegerValue (0), + MakeUintegerAccessor (&Node::m_id), + MakeUintegerChecker ()) ; return tid; } @end verbatim -Finally, when users want to create Nodes, they call: + +Look at the TypeId of an ns-3 @code{Object} class as an extended form of run +time type information (RTTI). The C++ language includes simple kind of RTTI +in order to support @code{dynamic_cast} and @code{typeid} operators. + +The ``@code{.SetParent ()}'' call in the declaration above is used in +conjunction with our object aggregation mechanisms to allow safe up- and +down-casing in inheritance trees during @code{GetObject}. + +The ``@code{.AddConstructor ()}'' call is used in conjunction with our +abstract object factory mechanisms to allow us to construct C++ objects without +forcing a user to know the concrete class of the object she is building. + +The three calls to ``@code{.AddAttribute}'' associate a given string with a +strongly typed value in the class. Notice that you must provide a help string +which may be displayed, for example, via command line processors. Each +@code{Attribute} is associated with mechanisms for accessing the underlying +member variable in the object (for example, @code{MakeUintegerAccessor} tells +the generic @code{Attribute} code how to get to the node ID above). There are +also ``Checker'' methods which are used to validate values. + +When users want to create Nodes, they will usually call some form of +@code{CreateObject}, + @verbatim Ptr n = CreateObject (); @end verbatim +or more abstractly, using an object factory, you can create a @code{Node} object +without even knowing the concrete C++ type + +@verbatim + ObjectFactory factory; + const std::string typeId = "ns3::Node''; + factory.SetTypeId(typeId); + Ptr node = factory.Create (); +@end verbatim + +Both of these methods result in fully initialized attributes being available +in the resulting @code{Object} instances. + We next discuss how attributes (values associated with member variables or functions of the class) are plumbed into the above TypeId. @@ -206,6 +258,7 @@ and some type of global default value. In the ns-3 attribute system, these value definitions and accessor functions are moved into the TypeId class; e.g.: + @verbatim NS_OBJECT_ENSURE_REGISTERED (DropTailQueue); @@ -358,11 +411,11 @@ Now, let's set it to another value (60 packets) @subsubsection Namespace-based access -An alternative way to get at the attribute is to use the configuration -namespace. Here, this attribute resides on a known path in this -namespace; this approach is useful if one doesn't have access to -the underlying pointers and would like to configure a specific -attribute with a single statement. +An alternative way to get at the attribute is to use the configuration namespace. +Here, this attribute resides on a known path in this namespace; this approach +is useful if one doesn't have access to the underlying pointers and would like +to configure a specific attribute with a single statement. + @verbatim Config::Set ("/NodeList/0/DeviceList/0/TxQueue/MaxPackets", UintegerValue (25)); txQueue->GetAttribute ("MaxPackets", limit); @@ -370,9 +423,8 @@ attribute with a single statement. limit.Get () << " packets"); @end verbatim -We could have also used wildcards to set this value for all nodes -and all net devices (which in this simple example has the same -effect as the previous Set()) +We could have also used wildcards to set this value for all nodes and all net +devices (which in this simple example has the same effect as the previous Set()) @verbatim Config::Set ("/NodeList/*/DeviceList/*/TxQueue/MaxPackets", UintegerValue (15)); txQueue->GetAttribute ("MaxPackets", limit); @@ -380,6 +432,22 @@ effect as the previous Set()) limit.Get () << " packets"); @end verbatim +@subsubsection Object Name Service-based access + +Another way to get at the attribute is to use the object name service facility. +Here, this attribute is found using a name string. This approach is useful if +one doesn't have access to the underlying pointers and it is difficult to +determine the required concrete configuration namespaced path. + +@verbatim + Names::Add ("server", serverNode); + Names::Add ("server/eth0", serverDevice); + + ... + + Config::Set ("/Names/server/eth0/TxQueue/MaxPackets", UintegerValue (25)); +@end verbatim + @subsection Setting through constructors helper classes Arbitrary combinations of attributes can be set and fetched from @@ -438,13 +506,13 @@ Consider this variable in class TcpSocket: Suppose that someone working with Tcp wanted to get or set the value of that variable using the metadata system. If it were not already provided by ns-3, the user could declare the following addition -in the metadata system (to the TypeId declaration for TcpSocket): +in the runtime metadata system (to the TypeId declaration for TcpSocket): @verbatim - .AddParameter ("Congestion window", + .AddAttribute ("Congestion window", "Tcp congestion window (bytes)", - Uinteger (1), + UintegerValue (1), MakeUintegerAccessor (&TcpSocket::m_cWnd), - MakeUintegerChecker ()); + MakeUintegerChecker ()) @end verbatim @@ -511,21 +579,26 @@ wants to hook it in to the attribute system, there is mainly the matter of writing the conversions to/from strings and attribute values. Most of this can be copy/pasted with macro-ized code. For instance, consider class -Rectangle in the @code{src/mobility/} directory: +delcaration for Rectangle in the @code{src/mobility/} directory: -One line is added to the class declaration: @verbatim /** * \brief a 2d rectangle */ class Rectangle { -... + ... + double xMin; + double xMax; + double yMin; + double yMax; }; @end verbatim -One macro call and two operators, are added below the class declaration: +One macro call and two operators, must be added below the class declaration +in order to turn a Rectangle into a value usable by the @code{Attribute} +system: @verbatim std::ostream &operator << (std::ostream &os, const Rectangle &rectangle); @@ -534,7 +607,7 @@ std::istream &operator >> (std::istream &is, Rectangle &rectangle); ATTRIBUTE_HELPER_HEADER (Rectangle); @end verbatim -In the class definition, the code looks like this: +In the class definition (@code{.cc} file), the code looks like this: @verbatim ATTRIBUTE_HELPER_CPP (Rectangle); @@ -568,9 +641,9 @@ of an instance of the new class. @node ConfigStore @section ConfigStore -@strong{Feedback requested:} This is an experimental feature of ns-3. -It is not in the main tree. If you like this feature and would like -to provide feedback on it, please email us. +@strong{Feedback requested:} This is an experimental feature of ns-3. It is +found in @code{src/contrib} and not in the main tree. If you like this feature +and would like to provide feedback on it, please email us. Values for ns-3 attributes can be stored in an ascii text file and loaded into a future simulation. This feature is known as the From c07a0c51168691aa54b895eb42a8fee34c60552e Mon Sep 17 00:00:00 2001 From: Mathieu Lacage Date: Sat, 4 Jul 2009 08:14:38 +0200 Subject: [PATCH 22/46] tweaks --- RELEASE_NOTES | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/RELEASE_NOTES b/RELEASE_NOTES index 4264e8903..79f4dbce8 100644 --- a/RELEASE_NOTES +++ b/RELEASE_NOTES @@ -4,9 +4,7 @@ This file contains ns-3 release notes (most recent releases first). All of the ns-3 documentation is accessible from the ns-3 website: -http://www.nsnam.org -including tutorials: -http://www.nsnam.org/tutorials.html +http://www.nsnam.org including tutorials: http://www.nsnam.org/tutorials.html Release 3.5 =========== @@ -64,8 +62,8 @@ Future releases --------------- Our next release, which is expected to happen in 2 to 4 months from now, will feature the merging of some of our projects currently in development including -fuller IPv6 support, and some smaller features such as a new Global ARP package -and possibly a new Testing and Validation suite. +fuller IPv6 support, some smaller features such as a new Global ARP +package, and possibly a new Testing and Validation suite. Release 3.4 =========== From a5e2a675640e2db08f4c212c7c44ce2c765a9973 Mon Sep 17 00:00:00 2001 From: Mathieu Lacage Date: Sat, 4 Jul 2009 08:14:57 +0200 Subject: [PATCH 23/46] bump version number --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 1b8ef0972..5a958026d 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3-dev +3.5 From e3015a9df682912333a577fc8093bf09ef40c425 Mon Sep 17 00:00:00 2001 From: Mathieu Lacage Date: Sat, 4 Jul 2009 08:15:48 +0200 Subject: [PATCH 24/46] Added tag ns-3.5 for changeset c975274c9707 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 4d7dfea78..164114709 100644 --- a/.hgtags +++ b/.hgtags @@ -35,3 +35,4 @@ dfd0bc16dc991313896f351530a3dc5a25f62e15 ns-3.3-RC4 13a5b15fbe3429a6c3d00c1bccffa2c156a0603b ns-3.5-rc1 8562a42accf6f715d312c037326ec7da48095e13 ns-3.5-rc2 a600c11ff8d40a40e88c2d692acad6512dde70c8 ns-3.5-rc3 +c975274c9707b1f07d94cc51f205c351122131a5 ns-3.5 From 9d5557f7b95eb65d18c70e420abd9a4daccad02c Mon Sep 17 00:00:00 2001 From: Mathieu Lacage Date: Sat, 4 Jul 2009 08:53:44 +0200 Subject: [PATCH 25/46] bring back the -dev version number --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 5a958026d..1b8ef0972 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3.5 +3-dev From d90fd1db17dca5b1ca01158db523ad16cd8b0c58 Mon Sep 17 00:00:00 2001 From: Mathieu Lacage Date: Tue, 7 Jul 2009 13:03:21 +0200 Subject: [PATCH 26/46] add StaticCast to mirror DynamicCast and ConstCast --- src/core/ptr.h | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/core/ptr.h b/src/core/ptr.h index c61db5506..b7ebc0d8e 100644 --- a/src/core/ptr.h +++ b/src/core/ptr.h @@ -373,6 +373,13 @@ DynamicCast (Ptr const&p) return Ptr (dynamic_cast (PeekPointer (p))); } +template +Ptr +StaticCast (Ptr const&p) +{ + return Ptr (static_cast (PeekPointer (p))); +} + /**************************************************** * Member method implementations. From 1da654aeb0be9e474cd0d0b652ffe5b5076438c3 Mon Sep 17 00:00:00 2001 From: Mathieu Lacage Date: Tue, 7 Jul 2009 13:05:23 +0200 Subject: [PATCH 27/46] kill dead code --- src/internet-stack/ipv4-checksum.cc | 52 ----------------------------- src/internet-stack/ipv4-checksum.h | 33 ------------------ src/internet-stack/wscript | 1 - 3 files changed, 86 deletions(-) delete mode 100644 src/internet-stack/ipv4-checksum.cc delete mode 100644 src/internet-stack/ipv4-checksum.h diff --git a/src/internet-stack/ipv4-checksum.cc b/src/internet-stack/ipv4-checksum.cc deleted file mode 100644 index 5e93b4a7d..000000000 --- a/src/internet-stack/ipv4-checksum.cc +++ /dev/null @@ -1,52 +0,0 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ -/* - * Copyright (c) 2005,2006,2007 INRIA - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation; - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * Author: Mathieu Lacage - */ -#include "ipv4-checksum.h" - -namespace ns3 { - -uint16_t -Ipv4ChecksumCalculate (uint16_t checksum, uint8_t *buffer, uint16_t size) -{ - /* see RFC 1071 to understand this code. */ - uint32_t sum = checksum; - uint16_t *data = (uint16_t *) buffer; - for (uint16_t i = 0; i < (size/2); i++) { - sum += data[i]; - } - if ((size % 2) != 0) { - uint8_t tmpBuf[2]; - tmpBuf[0] = buffer[size-1]; - tmpBuf[1] = 0; - data = (uint16_t *)tmpBuf; - sum += *data; - } - while (sum >> 16) { - sum = (sum & 0xffff) + (sum >> 16); - } - return sum; -} - -uint16_t -Ipv4ChecksumComplete (uint16_t checksum) -{ - return ~checksum; -} - -}; //namespace ns3 diff --git a/src/internet-stack/ipv4-checksum.h b/src/internet-stack/ipv4-checksum.h deleted file mode 100644 index 98bbed5c2..000000000 --- a/src/internet-stack/ipv4-checksum.h +++ /dev/null @@ -1,33 +0,0 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ -/* - * Copyright (c) 2005,2006,2007 INRIA - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation; - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * Author: Mathieu Lacage - */ -#ifndef IPV4_CHECKSUM_H -#define IPV4_CHECKSUM_H - -#include - -namespace ns3 { - -uint16_t Ipv4ChecksumCalculate (uint16_t checksum, uint8_t *buffer, uint16_t size); - -uint16_t Ipv4ChecksumComplete (uint16_t checksum); - -}; //namespace ns3 - -#endif /* IPV4_CHECKSUM_H */ diff --git a/src/internet-stack/wscript b/src/internet-stack/wscript index 6e97c09d4..9d4ea3118 100644 --- a/src/internet-stack/wscript +++ b/src/internet-stack/wscript @@ -78,7 +78,6 @@ def build(bld): 'ipv4-l4-protocol.cc', 'udp-header.cc', 'tcp-header.cc', - 'ipv4-checksum.cc', 'ipv4-interface.cc', 'ipv4-l3-protocol.cc', 'ipv4-end-point.cc', From 37f9bb6100c19787f5477456f4ab4a7a459d6991 Mon Sep 17 00:00:00 2001 From: Mathieu Lacage Date: Tue, 7 Jul 2009 16:18:55 +0200 Subject: [PATCH 28/46] kill confusing virtual keywords --- src/devices/csma/csma-channel.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/devices/csma/csma-channel.h b/src/devices/csma/csma-channel.h index ff92825b3..d59ff96f3 100644 --- a/src/devices/csma/csma-channel.h +++ b/src/devices/csma/csma-channel.h @@ -259,14 +259,14 @@ public: * \return Returns the DataRate to be used by device transmitters. * with deviceId i. */ - virtual DataRate GetDataRate (void); + DataRate GetDataRate (void); /** * Get the assigned speed-of-light delay of the channel * * \return Returns the delay used by the channel. */ - virtual Time GetDelay (void); + Time GetDelay (void); private: From ceccfdbb80c78d4732f625eac244a5ab604f4c93 Mon Sep 17 00:00:00 2001 From: Mathieu Lacage Date: Tue, 7 Jul 2009 21:18:01 +0200 Subject: [PATCH 29/46] avoid excessive calls to GetObject during topology construction --- src/internet-stack/arp-l3-protocol.cc | 13 ++++++++----- src/internet-stack/icmpv4-l4-protocol.cc | 21 +++++++++++++-------- src/internet-stack/ipv4-l3-protocol.cc | 13 ++++++++----- src/internet-stack/nsc-tcp-l4-protocol.cc | 23 ++++++++++++++--------- src/internet-stack/tcp-l4-protocol.cc | 23 ++++++++++++++--------- src/internet-stack/udp-l4-protocol.cc | 23 ++++++++++++++--------- 6 files changed, 71 insertions(+), 45 deletions(-) diff --git a/src/internet-stack/arp-l3-protocol.cc b/src/internet-stack/arp-l3-protocol.cc index c2f7ac5ea..f98f9f2ad 100644 --- a/src/internet-stack/arp-l3-protocol.cc +++ b/src/internet-stack/arp-l3-protocol.cc @@ -81,12 +81,15 @@ ArpL3Protocol::SetNode (Ptr node) void ArpL3Protocol::NotifyNewAggregate () { - Ptrnode = this->GetObject (); - //verify that it's a valid node and that - //the node was not set before - if (node!= 0 && m_node == 0) + if (m_node == 0) { - this->SetNode (node); + Ptrnode = this->GetObject (); + //verify that it's a valid node and that + //the node was not set before + if (node != 0) + { + this->SetNode (node); + } } Object::NotifyNewAggregate (); } diff --git a/src/internet-stack/icmpv4-l4-protocol.cc b/src/internet-stack/icmpv4-l4-protocol.cc index 231a58607..93bd54467 100644 --- a/src/internet-stack/icmpv4-l4-protocol.cc +++ b/src/internet-stack/icmpv4-l4-protocol.cc @@ -50,15 +50,20 @@ Icmpv4L4Protocol::SetNode (Ptr node) void Icmpv4L4Protocol::NotifyNewAggregate () { - bool is_not_initialized = (m_node == 0); - Ptrnode = this->GetObject (); - Ptr ipv4 = this->GetObject (); - if (is_not_initialized && node!= 0 && ipv4 != 0) + if (m_node == 0) { - this->SetNode (node); - ipv4->Insert (this); - Ptr rawFactory = CreateObject (); - ipv4->AggregateObject (rawFactory); + Ptr node = this->GetObject (); + if (node != 0) + { + Ptr ipv4 = this->GetObject (); + if (ipv4 != 0) + { + this->SetNode (node); + ipv4->Insert (this); + Ptr rawFactory = CreateObject (); + ipv4->AggregateObject (rawFactory); + } + } } Object::NotifyNewAggregate (); } diff --git a/src/internet-stack/ipv4-l3-protocol.cc b/src/internet-stack/ipv4-l3-protocol.cc index c3bbbf982..793b8bb43 100644 --- a/src/internet-stack/ipv4-l3-protocol.cc +++ b/src/internet-stack/ipv4-l3-protocol.cc @@ -146,12 +146,15 @@ Ipv4L3Protocol::DeleteRawSocket (Ptr socket) void Ipv4L3Protocol::NotifyNewAggregate () { - Ptrnode = this->GetObject(); - // verify that it's a valid node and that - // the node has not been set before - if (node!= 0 && m_node == 0) + if (m_node == 0) { - this->SetNode (node); + Ptrnode = this->GetObject(); + // verify that it's a valid node and that + // the node has not been set before + if (node != 0) + { + this->SetNode (node); + } } Object::NotifyNewAggregate (); } diff --git a/src/internet-stack/nsc-tcp-l4-protocol.cc b/src/internet-stack/nsc-tcp-l4-protocol.cc index 514d4c245..f8af6ec79 100644 --- a/src/internet-stack/nsc-tcp-l4-protocol.cc +++ b/src/internet-stack/nsc-tcp-l4-protocol.cc @@ -164,16 +164,21 @@ NscTcpL4Protocol::SetNode (Ptr node) void NscTcpL4Protocol::NotifyNewAggregate () { - bool is_not_initialized = (m_node == 0); - Ptrnode = this->GetObject (); - Ptr ipv4 = this->GetObject (); - if (is_not_initialized && node!= 0 && ipv4 != 0) + if (m_node == 0) { - this->SetNode (node); - ipv4->Insert (this); - Ptr tcpFactory = CreateObject (); - tcpFactory->SetTcp (this); - node->AggregateObject (tcpFactory); + Ptrnode = this->GetObject (); + if (node != 0) + { + Ptr ipv4 = this->GetObject (); + if (ipv4 != 0) + { + this->SetNode (node); + ipv4->Insert (this); + Ptr tcpFactory = CreateObject (); + tcpFactory->SetTcp (this); + node->AggregateObject (tcpFactory); + } + } } Object::NotifyNewAggregate (); } diff --git a/src/internet-stack/tcp-l4-protocol.cc b/src/internet-stack/tcp-l4-protocol.cc index 93fc216b2..433ea7dbd 100644 --- a/src/internet-stack/tcp-l4-protocol.cc +++ b/src/internet-stack/tcp-l4-protocol.cc @@ -366,16 +366,21 @@ TcpL4Protocol::SetNode (Ptr node) void TcpL4Protocol::NotifyNewAggregate () { - bool is_not_initialized = (m_node == 0); - Ptrnode = this->GetObject (); - Ptr ipv4 = this->GetObject (); - if (is_not_initialized && node!= 0 && ipv4 != 0) + if (m_node == 0) { - this->SetNode (node); - ipv4->Insert (this); - Ptr tcpFactory = CreateObject (); - tcpFactory->SetTcp (this); - node->AggregateObject (tcpFactory); + Ptr node = this->GetObject (); + if (node != 0) + { + Ptr ipv4 = this->GetObject (); + if (ipv4 != 0) + { + this->SetNode (node); + ipv4->Insert (this); + Ptr tcpFactory = CreateObject (); + tcpFactory->SetTcp (this); + node->AggregateObject (tcpFactory); + } + } } Object::NotifyNewAggregate (); } diff --git a/src/internet-stack/udp-l4-protocol.cc b/src/internet-stack/udp-l4-protocol.cc index 2f3bf9fc3..972e3c9bf 100644 --- a/src/internet-stack/udp-l4-protocol.cc +++ b/src/internet-stack/udp-l4-protocol.cc @@ -77,16 +77,21 @@ UdpL4Protocol::SetNode (Ptr node) void UdpL4Protocol::NotifyNewAggregate () { - bool is_not_initialized = (m_node == 0); - Ptrnode = this->GetObject (); - Ptr ipv4 = this->GetObject (); - if (is_not_initialized && node!= 0 && ipv4 != 0) + if (m_node == 0) { - this->SetNode (node); - ipv4->Insert (this); - Ptr udpFactory = CreateObject (); - udpFactory->SetUdp (this); - node->AggregateObject (udpFactory); + Ptr node = this->GetObject (); + if (node != 0) + { + Ptr ipv4 = this->GetObject (); + if (ipv4 != 0) + { + this->SetNode (node); + ipv4->Insert (this); + Ptr udpFactory = CreateObject (); + udpFactory->SetUdp (this); + node->AggregateObject (udpFactory); + } + } } Object::NotifyNewAggregate (); } From 9cd2aaf73ef637d832d89f135dce95a16c7dfd4b Mon Sep 17 00:00:00 2001 From: Mirko Banchi Date: Tue, 7 Jul 2009 23:43:47 +0200 Subject: [PATCH 30/46] coding style --- src/devices/wifi/mac-low.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/devices/wifi/mac-low.cc b/src/devices/wifi/mac-low.cc index 6946e7e75..a394deccd 100644 --- a/src/devices/wifi/mac-low.cc +++ b/src/devices/wifi/mac-low.cc @@ -584,11 +584,11 @@ MacLow::ReceiveOk (Ptr packet, double rxSnr, WifiMode txMode, WifiPreamb { m_listener->GotAck (rxSnr, txMode); } - if (m_txParams.HasNextPacket ()) - { - m_waitSifsEvent = Simulator::Schedule (GetSifs (), + if (m_txParams.HasNextPacket ()) + { + m_waitSifsEvent = Simulator::Schedule (GetSifs (), &MacLow::WaitSifsAfterEndTx, this); - } + } } else if (hdr.IsCtl ()) { From 7c019c2ef36cf8b4fcb0f66f69d22dc25bec4656 Mon Sep 17 00:00:00 2001 From: Mirko Banchi Date: Tue, 7 Jul 2009 23:48:03 +0200 Subject: [PATCH 31/46] coding style --- src/devices/wifi/mac-low.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/devices/wifi/mac-low.cc b/src/devices/wifi/mac-low.cc index a394deccd..bc0ee2035 100644 --- a/src/devices/wifi/mac-low.cc +++ b/src/devices/wifi/mac-low.cc @@ -587,7 +587,7 @@ MacLow::ReceiveOk (Ptr packet, double rxSnr, WifiMode txMode, WifiPreamb if (m_txParams.HasNextPacket ()) { m_waitSifsEvent = Simulator::Schedule (GetSifs (), - &MacLow::WaitSifsAfterEndTx, this); + &MacLow::WaitSifsAfterEndTx, this); } } else if (hdr.IsCtl ()) From 97615b3dfcba98383957739e222490249bac55cf Mon Sep 17 00:00:00 2001 From: "Gustavo J. A. M. Carneiro" Date: Wed, 8 Jul 2009 11:14:16 +0100 Subject: [PATCH 32/46] =?UTF-8?q?Bug=20628:=20Virtual=20Net=20Device's=20D?= =?UTF-8?q?oDispose=20doesn't=20clean=20up=20properly;=20patch=20by=20Antt?= =?UTF-8?q?i=20M=C3=A4kel=C3=A4.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/devices/virtual-net-device/virtual-net-device.cc | 1 + 1 file changed, 1 insertion(+) diff --git a/src/devices/virtual-net-device/virtual-net-device.cc b/src/devices/virtual-net-device/virtual-net-device.cc index c97ad98fb..2c7412c42 100644 --- a/src/devices/virtual-net-device/virtual-net-device.cc +++ b/src/devices/virtual-net-device/virtual-net-device.cc @@ -115,6 +115,7 @@ VirtualNetDevice::~VirtualNetDevice() void VirtualNetDevice::DoDispose() { NS_LOG_FUNCTION_NOARGS (); + m_node = 0; NetDevice::DoDispose (); } From e56c013bb11a9d37f77d682966b67f40247b3bd0 Mon Sep 17 00:00:00 2001 From: Tom Henderson Date: Wed, 8 Jul 2009 10:05:39 -0700 Subject: [PATCH 33/46] fix doxygen errors --- doc/modules | 4 ++-- src/helper/nqos-wifi-mac-helper.h | 2 +- src/helper/qos-wifi-mac-helper.h | 2 +- src/node/ipv4-routing-protocol.h | 11 +++++++---- src/routing/list-routing/ipv4-list-routing.h | 2 +- src/routing/static-routing/ipv4-routing-table-entry.h | 4 ++-- src/routing/static-routing/ipv4-static-routing.h | 2 +- 7 files changed, 15 insertions(+), 12 deletions(-) diff --git a/doc/modules b/doc/modules index 7c6a7b347..36b640ee5 100644 --- a/doc/modules +++ b/doc/modules @@ -49,14 +49,14 @@ * - an ARP module * - a UDP and a TCP implementation * + * @defgroup routing Routing + * * @defgroup helper Helpers * * @defgroup applications Applications * * @defgroup mobility Mobility * - * @defgroup routing Routing - * * @defgroup constants Constants * @brief Constants you can change * diff --git a/src/helper/nqos-wifi-mac-helper.h b/src/helper/nqos-wifi-mac-helper.h index ae67b1922..032d783ba 100644 --- a/src/helper/nqos-wifi-mac-helper.h +++ b/src/helper/nqos-wifi-mac-helper.h @@ -70,7 +70,6 @@ public: std::string n6 = "", const AttributeValue &v6 = EmptyAttributeValue (), std::string n7 = "", const AttributeValue &v7 = EmptyAttributeValue ()); /** - * \param type the type of ns3::WifiMac to create. * \param n0 the name of the attribute to set * \param v0 the value of the attribute to set * \param n1 the name of the attribute to set @@ -78,6 +77,7 @@ public: * \param n2 the name of the attribute to set * \param v2 the value of the attribute to set * \param n3 the name of the attribute to set + * \param v3 the value of the attribute to set */ void SetDcaParameters (std::string n0 = "", const AttributeValue &v0 = EmptyAttributeValue (), std::string n1 = "", const AttributeValue &v1 = EmptyAttributeValue (), diff --git a/src/helper/qos-wifi-mac-helper.h b/src/helper/qos-wifi-mac-helper.h index 32537283a..cfe1cb84f 100644 --- a/src/helper/qos-wifi-mac-helper.h +++ b/src/helper/qos-wifi-mac-helper.h @@ -74,7 +74,7 @@ public: /** * \param accessClass access class for which we are setting aggregator. Possibilities * are: AC_BK, AC_BE, AC_VI, AC_VO. - * \param aggregatorType type of aggregator. + * \param type the type of ns3::WifiMac to create. * \param n0 the name of the attribute to set * \param v0 the value of the attribute to set * \param n1 the name of the attribute to set diff --git a/src/node/ipv4-routing-protocol.h b/src/node/ipv4-routing-protocol.h index aa5d2eb4f..23ec9ca30 100644 --- a/src/node/ipv4-routing-protocol.h +++ b/src/node/ipv4-routing-protocol.h @@ -34,10 +34,13 @@ class NetDevice; /** * \ingroup node - * \defgroup ipv4Routing Ipv4 Routing - * - * Abstract base class for Ipv4 routing protocols. Defines two - * virtual functions for packet routing and forwarding. The first, + * \defgroup ipv4Routing Ipv4RoutingProtocol + */ +/* + * \ingroup ipv4Routing + * \brief Abstract base class for IPv4 routing protocols. + * + * Defines two virtual functions for packet routing and forwarding. The first, * RouteOutput(), is used for locally originated packets, and the second, * RouteInput(), is used for forwarding and/or delivering received packets. * Also defines the signatures of four callbacks used in RouteInput(). diff --git a/src/routing/list-routing/ipv4-list-routing.h b/src/routing/list-routing/ipv4-list-routing.h index 1ae86aaae..541411a1e 100644 --- a/src/routing/list-routing/ipv4-list-routing.h +++ b/src/routing/list-routing/ipv4-list-routing.h @@ -25,7 +25,7 @@ namespace ns3 { /** - * \ingroup ipv4Routing + * \ingroup routing * * This class is a specialization of Ipv4RoutingProtocol that allows * other instances of Ipv4RoutingProtocol to be inserted in a diff --git a/src/routing/static-routing/ipv4-routing-table-entry.h b/src/routing/static-routing/ipv4-routing-table-entry.h index b4597afde..f5f8cde89 100644 --- a/src/routing/static-routing/ipv4-routing-table-entry.h +++ b/src/routing/static-routing/ipv4-routing-table-entry.h @@ -29,7 +29,7 @@ namespace ns3 { /** - * \ingroup ipv4Routing + * \ingroup routing * * A record of an IPv4 routing table entry for Ipv4GlobalRouting and * Ipv4StaticRouting. This is not a reference counted object. @@ -155,7 +155,7 @@ private: std::ostream& operator<< (std::ostream& os, Ipv4RoutingTableEntry const& route); /** - * \ingroup ipv4Routing + * \ingroup routing * * \brief A record of an IPv4 multicast route for Ipv4GlobalRouting and Ipv4StaticRouting */ diff --git a/src/routing/static-routing/ipv4-static-routing.h b/src/routing/static-routing/ipv4-static-routing.h index 9f7ed0b85..3564602aa 100644 --- a/src/routing/static-routing/ipv4-static-routing.h +++ b/src/routing/static-routing/ipv4-static-routing.h @@ -43,7 +43,7 @@ class Ipv4MulticastRoutingTableEntry; class Node; /** - * \ingroup ipv4Routing + * \ingroup routing * * \brief Static routing protocol for IP version 4 stacks. * From 1817b596db3ff6a7e34853a09a59c0ee4853b501 Mon Sep 17 00:00:00 2001 From: Tom Henderson Date: Wed, 8 Jul 2009 10:47:22 -0700 Subject: [PATCH 34/46] a few more doxygen fixes --- src/node/ipv4-routing-protocol.h | 2 +- src/routing/list-routing/ipv4-list-routing.h | 4 ++++ src/routing/static-routing/ipv4-static-routing.h | 4 ++++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/node/ipv4-routing-protocol.h b/src/node/ipv4-routing-protocol.h index 23ec9ca30..dd791dae6 100644 --- a/src/node/ipv4-routing-protocol.h +++ b/src/node/ipv4-routing-protocol.h @@ -36,7 +36,7 @@ class NetDevice; * \ingroup node * \defgroup ipv4Routing Ipv4RoutingProtocol */ -/* +/** * \ingroup ipv4Routing * \brief Abstract base class for IPv4 routing protocols. * diff --git a/src/routing/list-routing/ipv4-list-routing.h b/src/routing/list-routing/ipv4-list-routing.h index 541411a1e..42581ab53 100644 --- a/src/routing/list-routing/ipv4-list-routing.h +++ b/src/routing/list-routing/ipv4-list-routing.h @@ -26,6 +26,10 @@ namespace ns3 { /** * \ingroup routing + * \defgroup ipv4ListRouting Ipv4 List Routing + */ +/** + * \ingroup ipv4ListRouting * * This class is a specialization of Ipv4RoutingProtocol that allows * other instances of Ipv4RoutingProtocol to be inserted in a diff --git a/src/routing/static-routing/ipv4-static-routing.h b/src/routing/static-routing/ipv4-static-routing.h index 3564602aa..68f942b48 100644 --- a/src/routing/static-routing/ipv4-static-routing.h +++ b/src/routing/static-routing/ipv4-static-routing.h @@ -44,6 +44,10 @@ class Node; /** * \ingroup routing + * \defgroup ipv4StaticRouting Ipv4StaticRouting + */ +/** + * \ingroup ipv4StaticRouting * * \brief Static routing protocol for IP version 4 stacks. * From fe614e6e90d68d213623daaabe73b45bd2fa4e8b Mon Sep 17 00:00:00 2001 From: Tom Henderson Date: Wed, 8 Jul 2009 21:45:23 -0700 Subject: [PATCH 35/46] fix bug preventing the sending of packets to a local IP address (bug 632) --- src/internet-stack/ipv4-interface.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/internet-stack/ipv4-interface.cc b/src/internet-stack/ipv4-interface.cc index 67754a114..c54155152 100644 --- a/src/internet-stack/ipv4-interface.cc +++ b/src/internet-stack/ipv4-interface.cc @@ -199,7 +199,7 @@ Ipv4Interface::Send (Ptr p, Ipv4Address dest) { Ptr ipv4 = m_node->GetObject (); - ipv4->Receive (0, p, Ipv4L3Protocol::PROT_NUMBER, + ipv4->Receive (m_device, p, Ipv4L3Protocol::PROT_NUMBER, m_device->GetBroadcast (), m_device->GetBroadcast (), NetDevice::PACKET_HOST // note: linux uses PACKET_LOOPBACK here From 1dd403987a6d806f37cbc3536dc6b3196c483eb1 Mon Sep 17 00:00:00 2001 From: Craig Dowell Date: Fri, 10 Jul 2009 09:50:24 -0700 Subject: [PATCH 36/46] harden emu net device against malformed packets --- src/devices/emu/emu-net-device.cc | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/src/devices/emu/emu-net-device.cc b/src/devices/emu/emu-net-device.cc index 3249daa7e..757968c3f 100644 --- a/src/devices/emu/emu-net-device.cc +++ b/src/devices/emu/emu-net-device.cc @@ -612,6 +612,19 @@ EmuNetDevice::ForwardUp (uint8_t *buf, uint32_t len) Ptr originalPacket = packet->Copy (); EthernetHeader header (false); + + // + // This device could be running in an environment where completely unexpected + // kinds of packets are flying around, so we need to harden things a bit and + // filter out packets we think are completely bogus, so we always check to see + // that the packet is long enough to contain the header we want to remove. + // + if (packet->GetSize() < header.GetSerializedSize()) + { + m_phyRxDropTrace (originalPacket); + return; + } + packet->RemoveHeader (header); NS_LOG_LOGIC ("Pkt source is " << header.GetSource ()); @@ -628,6 +641,16 @@ EmuNetDevice::ForwardUp (uint8_t *buf, uint32_t len) if (header.GetLengthType () <= 1500) { LlcSnapHeader llc; + // + // Check to see that the packet is long enough to possibly contain the + // header we want to remove before just naively calling. + // + if (packet->GetSize() < llc.GetSerializedSize()) + { + m_phyRxDropTrace (originalPacket); + return; + } + packet->RemoveHeader (llc); protocol = llc.GetType (); } From f4e1452cebb726d2d92dc5b8bd1cbf0b538d26e5 Mon Sep 17 00:00:00 2001 From: Craig Dowell Date: Fri, 10 Jul 2009 11:56:35 -0700 Subject: [PATCH 37/46] emu device shouldn't be adding an FCS --- src/devices/emu/emu-net-device.cc | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/devices/emu/emu-net-device.cc b/src/devices/emu/emu-net-device.cc index 757968c3f..6eb4b4179 100644 --- a/src/devices/emu/emu-net-device.cc +++ b/src/devices/emu/emu-net-device.cc @@ -810,10 +810,6 @@ EmuNetDevice::SendFrom (Ptr packet, const Address &src, const Address &d header.SetLengthType (packet->GetSize ()); packet->AddHeader (header); - EthernetTrailer trailer; - trailer.CalcFcs (packet); - packet->AddTrailer (trailer); - // // there's not much meaning associated with the different layers in this // device, so don't be surprised when they're all stacked together in From ced9c5087410cfbb88bfb000f20f066e41fc86da Mon Sep 17 00:00:00 2001 From: Pavel Boyko Date: Mon, 13 Jul 2009 09:07:02 +0200 Subject: [PATCH 38/46] Use operator== instead of operator!= in NS_TEST_ASSERT_EQUAL --- src/core/test.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/test.h b/src/core/test.h index fa126e1f9..26caeae9c 100644 --- a/src/core/test.h +++ b/src/core/test.h @@ -115,7 +115,7 @@ private: #define NS_TEST_ASSERT_EQUAL_FILELINE(got, expected, file, line) \ do { \ - if ((got) != (expected)) \ + if (! ((got) == (expected))) \ { \ Failure () << file << ":" < Date: Mon, 13 Jul 2009 09:57:32 +0200 Subject: [PATCH 39/46] bug 627: Jakes Propagation Loss Model doesn't properly calculate signal loss --- .../wifi/jakes-propagation-loss-model.cc | 39 ++++++++++++------- .../wifi/jakes-propagation-loss-model.h | 3 ++ 2 files changed, 28 insertions(+), 14 deletions(-) diff --git a/src/devices/wifi/jakes-propagation-loss-model.cc b/src/devices/wifi/jakes-propagation-loss-model.cc index d1e153bb9..440e92198 100644 --- a/src/devices/wifi/jakes-propagation-loss-model.cc +++ b/src/devices/wifi/jakes-propagation-loss-model.cc @@ -138,13 +138,15 @@ JakesPropagationLossModel::GetTypeId (void) .AddAttribute ("NumberOfRaysPerPath", "The number of rays to use by default for compute the fading coeficent for a given path (default is 1)", UintegerValue (1), - MakeUintegerAccessor (&JakesPropagationLossModel::m_nRays), + MakeUintegerAccessor (&JakesPropagationLossModel::SetNRays, + &JakesPropagationLossModel::GetNRays), MakeUintegerChecker ()) .AddAttribute ("NumberOfOscillatorsPerRay", "The number of oscillators to use by default for compute the coeficent for a given ray of a given " "path (default is 4)", UintegerValue (4), - MakeUintegerAccessor (&JakesPropagationLossModel::m_nOscillators), + MakeUintegerAccessor (&JakesPropagationLossModel::SetNOscillators, + &JakesPropagationLossModel::GetNOscillators), MakeUintegerChecker ()) .AddAttribute ("DopplerFreq", "The doppler frequency in Hz (f_d = v / lambda = v * f / c), the default is 0)", @@ -161,9 +163,10 @@ JakesPropagationLossModel::GetTypeId (void) } JakesPropagationLossModel::JakesPropagationLossModel () -{ - DoConstruct (); -} + : m_amp (0), + m_nRays (0), + m_nOscillators (0) +{} JakesPropagationLossModel::~JakesPropagationLossModel () { @@ -181,8 +184,16 @@ JakesPropagationLossModel::~JakesPropagationLossModel () } void -JakesPropagationLossModel::DoConstruct () +JakesPropagationLossModel::SetNRays (uint8_t nRays) { + m_nRays = nRays; +} + +void +JakesPropagationLossModel::SetNOscillators (uint8_t nOscillators) +{ + m_nOscillators = nOscillators; + delete [] m_amp; uint16_t N = 4 * m_nOscillators + 2; m_amp = new ComplexNumber[m_nOscillators + 1]; m_amp[0].real = 2.0 * sqrt(2.0 / N) * cos (PI / 4.0); @@ -195,17 +206,17 @@ JakesPropagationLossModel::DoConstruct () } } -void -JakesPropagationLossModel::SetNRays (uint8_t nRays) +uint8_t +JakesPropagationLossModel::GetNRays (void) const { - m_nRays = nRays; + return m_nRays; +} +uint8_t +JakesPropagationLossModel::GetNOscillators (void) const +{ + return m_nOscillators; } -void -JakesPropagationLossModel::SetNOscillators (uint8_t nOscillators) -{ - m_nOscillators = nOscillators; -} double JakesPropagationLossModel::DoCalcRxPower (double txPowerDbm, diff --git a/src/devices/wifi/jakes-propagation-loss-model.h b/src/devices/wifi/jakes-propagation-loss-model.h index 1833953db..971e77542 100644 --- a/src/devices/wifi/jakes-propagation-loss-model.h +++ b/src/devices/wifi/jakes-propagation-loss-model.h @@ -96,6 +96,9 @@ public: */ void SetNOscillators (uint8_t nOscillators); + uint8_t GetNRays (void) const; + uint8_t GetNOscillators (void) const; + private: JakesPropagationLossModel (const JakesPropagationLossModel &o); JakesPropagationLossModel & operator = (const JakesPropagationLossModel &o); From 70c0c5b283d980ab1395d343f25528586f0d6e58 Mon Sep 17 00:00:00 2001 From: Ramon Bauza Date: Mon, 13 Jul 2009 14:30:12 +0200 Subject: [PATCH 40/46] Support for 5 and 10Mhz wifi channels --- src/devices/wifi/interference-helper.cc | 40 ++++++ src/devices/wifi/interference-helper.h | 2 + src/devices/wifi/wifi-mac.cc | 78 +++++++++++ src/devices/wifi/wifi-mac.h | 10 ++ src/devices/wifi/wifi-phy-standard.h | 2 + src/devices/wifi/wifi-phy.cc | 160 ++++++++++++++++++++++ src/devices/wifi/wifi-phy.h | 16 +++ src/devices/wifi/yans-error-rate-model.cc | 16 +-- src/devices/wifi/yans-wifi-phy.cc | 38 +++++ src/devices/wifi/yans-wifi-phy.h | 2 + 10 files changed, 356 insertions(+), 8 deletions(-) diff --git a/src/devices/wifi/interference-helper.cc b/src/devices/wifi/interference-helper.cc index d1bebbebc..a9dec5c10 100644 --- a/src/devices/wifi/interference-helper.cc +++ b/src/devices/wifi/interference-helper.cc @@ -241,6 +241,18 @@ InterferenceHelper::CalculateTxDuration (uint32_t size, WifiMode payloadMode, Wi delay += m_plcpLongPreambleDelayUs; delay += lrint (ceil ((size * 8.0 + 48.0) / payloadMode.GetDataRate () / 4e-6) * 4); break; + case WIFI_PHY_STANDARD_80211_10Mhz: + delay += m_plcpLongPreambleDelayUs; + // symbol duration is 8us + delay += 8; + delay += lrint (ceil ((size * 8.0 + 16.0 + 6.0) / payloadMode.GetDataRate () / 8e-6) * 8); + break; + case WIFI_PHY_STANDARD_80211_5Mhz: + delay += m_plcpLongPreambleDelayUs; + // symbol duration is 16us + delay += 16; + delay += lrint (ceil ((size * 8.0 + 16.0 + 6.0) / payloadMode.GetDataRate () / 1.6e-5) * 16); + break; default: NS_ASSERT (false); break; @@ -277,6 +289,34 @@ InterferenceHelper::Configure80211bParameters (void) m_maxPacketDuration = CalculateTxDuration (4095, WifiPhy::Get1mbb (), WIFI_PREAMBLE_LONG); } +void +InterferenceHelper::Configure80211_10MhzParameters (void) +{ + NS_LOG_FUNCTION (this); + m_80211_standard = WIFI_PHY_STANDARD_80211_10Mhz; + m_plcpLongPreambleDelayUs = 32; + m_plcpShortPreambleDelayUs = 32; + m_longPlcpHeaderMode = WifiPhy::Get3mb10Mhz (); + m_shortPlcpHeaderMode = WifiPhy::Get3mb10Mhz (); + m_plcpHeaderLength = 4 + 1 + 12 + 1 + 6; + /* 4095 bytes at a 3Mb/s rate with a 1/2 coding rate. */ + m_maxPacketDuration = CalculateTxDuration (4095, WifiPhy::Get3mb10Mhz (), WIFI_PREAMBLE_LONG); +} + +void +InterferenceHelper::Configure80211_5MhzParameters (void) +{ + NS_LOG_FUNCTION (this); + m_80211_standard = WIFI_PHY_STANDARD_80211_5Mhz; + m_plcpLongPreambleDelayUs = 64; + m_plcpShortPreambleDelayUs = 64; + m_longPlcpHeaderMode = WifiPhy::Get1_5mb5Mhz (); + m_shortPlcpHeaderMode = WifiPhy::Get1_5mb5Mhz (); + m_plcpHeaderLength = 4 + 1 + 12 + 1 + 6; + /* 4095 bytes at a 1.5Mb/s rate with a 1/2 coding rate. */ + m_maxPacketDuration = CalculateTxDuration (4095, WifiPhy::Get1_5mb5Mhz (), WIFI_PREAMBLE_LONG); +} + void InterferenceHelper::AppendEvent (Ptr event) { diff --git a/src/devices/wifi/interference-helper.h b/src/devices/wifi/interference-helper.h index 78f73c91b..8a1819f37 100644 --- a/src/devices/wifi/interference-helper.h +++ b/src/devices/wifi/interference-helper.h @@ -71,6 +71,8 @@ public: void Configure80211aParameters (void); void Configure80211bParameters (void); + void Configure80211_10MhzParameters (void); + void Configure80211_5MhzParameters (void); void SetNoiseFigure (double value); void SetErrorRateModel (Ptr rate); diff --git a/src/devices/wifi/wifi-mac.cc b/src/devices/wifi/wifi-mac.cc index ddfe62b77..8f9bca897 100644 --- a/src/devices/wifi/wifi-mac.cc +++ b/src/devices/wifi/wifi-mac.cc @@ -117,6 +117,14 @@ WifiMac::GetTypeId (void) MakeSsidAccessor (&WifiMac::GetSsid, &WifiMac::SetSsid), MakeSsidChecker ()) + .AddAttribute ("Standard", "The standard chosen configures some MAC-specific constants", + EnumValue (WIFI_PHY_STANDARD_80211a), + MakeEnumAccessor (&WifiMac::SetStandard), + MakeEnumChecker (WIFI_PHY_STANDARD_80211a, "802.11a", + WIFI_PHY_STANDARD_80211b, "802.11b", + WIFI_PHY_STANDARD_80211_10Mhz,"802.11_10Mhz", + WIFI_PHY_STANDARD_80211_5Mhz,"802-11_5Mhz", + WIFI_PHY_STANDARD_holland, "holland")) .AddTraceSource ("MacTx", "A packet has been received from higher layers and is being processed in preparation for " "queueing for transmission.", @@ -200,4 +208,74 @@ WifiMac::NotifyRxDrop (Ptr packet) m_macRxDropTrace (packet); } +void +WifiMac::SetStandard (enum WifiPhyStandard standard) +{ + m_standard = standard; + switch (standard) { + case WIFI_PHY_STANDARD_80211a: + Configure80211a (); + break; + case WIFI_PHY_STANDARD_80211b: + Configure80211b (); + break; + case WIFI_PHY_STANDARD_80211_10Mhz: + Configure80211_10Mhz (); + break; + case WIFI_PHY_STANDARD_80211_5Mhz: + Configure80211_5Mhz (); + break; + case WIFI_PHY_STANDARD_holland: + Configure80211a (); + break; + default: + NS_ASSERT (false); + break; + } +} + +void +WifiMac::Configure80211a (void) +{ + SetSifs(MicroSeconds(16)); + SetSlot(MicroSeconds(9)); + SetEifsNoDifs(MicroSeconds(16+44)); + SetPifs(MicroSeconds(16+9)); + SetCtsTimeout(MicroSeconds(16+44+9+GetDefaultMaxPropagationDelay().GetMicroSeconds ()*2)); + SetAckTimeout(MicroSeconds(16+44+9+GetDefaultMaxPropagationDelay().GetMicroSeconds ()*2)); +} + +void +WifiMac::Configure80211b (void) +{ + SetSifs(MicroSeconds(10)); + SetSlot(MicroSeconds(20)); + SetEifsNoDifs(MicroSeconds(10+304)); + SetPifs(MicroSeconds(10+20)); + SetCtsTimeout(MicroSeconds(10+304+20+GetDefaultMaxPropagationDelay().GetMicroSeconds ()*2)); + SetAckTimeout(MicroSeconds(10+304+20+GetDefaultMaxPropagationDelay().GetMicroSeconds ()*2)); +} + +void +WifiMac::Configure80211_10Mhz (void) +{ + SetSifs(MicroSeconds(32)); + SetSlot(MicroSeconds(13)); + SetEifsNoDifs(MicroSeconds(32+88)); + SetPifs(MicroSeconds(32+13)); + SetCtsTimeout(MicroSeconds(32+88+13+GetDefaultMaxPropagationDelay().GetMicroSeconds ()*2)); + SetAckTimeout(MicroSeconds(32+88+13+GetDefaultMaxPropagationDelay().GetMicroSeconds ()*2)); +} + +void +WifiMac::Configure80211_5Mhz (void) +{ + SetSifs(MicroSeconds(64)); + SetSlot(MicroSeconds(21)); + SetEifsNoDifs(MicroSeconds(64+176)); + SetPifs(MicroSeconds(64+21)); + SetCtsTimeout(MicroSeconds(64+176+21+GetDefaultMaxPropagationDelay().GetMicroSeconds ()*2)); + SetAckTimeout(MicroSeconds(64+176+21+GetDefaultMaxPropagationDelay().GetMicroSeconds ()*2)); +} + } // namespace ns3 diff --git a/src/devices/wifi/wifi-mac.h b/src/devices/wifi/wifi-mac.h index 55efb553e..5a3d3d97a 100644 --- a/src/devices/wifi/wifi-mac.h +++ b/src/devices/wifi/wifi-mac.h @@ -206,6 +206,10 @@ public: * purposes. */ void NotifyRxDrop (Ptr packet); + /** + * \param standard the wifi standard to be configured + */ + void SetStandard (enum WifiPhyStandard standard); private: static Time GetDefaultMaxPropagationDelay (void); @@ -217,6 +221,12 @@ private: Time m_maxPropagationDelay; uint32_t m_maxMsduSize; + WifiPhyStandard m_standard; + + void Configure80211a (void); + void Configure80211b (void); + void Configure80211_10Mhz (void); + void Configure80211_5Mhz (); /** * The trace source fired when packets come into the "top" of the device diff --git a/src/devices/wifi/wifi-phy-standard.h b/src/devices/wifi/wifi-phy-standard.h index 6893f011d..7f6c84bfb 100644 --- a/src/devices/wifi/wifi-phy-standard.h +++ b/src/devices/wifi/wifi-phy-standard.h @@ -25,6 +25,8 @@ namespace ns3 { enum WifiPhyStandard { WIFI_PHY_STANDARD_80211a, WIFI_PHY_STANDARD_80211b, + WIFI_PHY_STANDARD_80211_10Mhz, + WIFI_PHY_STANDARD_80211_5Mhz, WIFI_PHY_STANDARD_holland }; diff --git a/src/devices/wifi/wifi-phy.cc b/src/devices/wifi/wifi-phy.cc index 617610c8d..5dbf82988 100644 --- a/src/devices/wifi/wifi-phy.cc +++ b/src/devices/wifi/wifi-phy.cc @@ -244,6 +244,150 @@ WifiPhy::Get11mbb (void) return mode; } +WifiMode +WifiPhy::Get3mb10Mhz (void) +{ + static WifiMode mode = WifiModeFactory::CreateBpsk ("wifi-3mbs-10Mhz", + true, + 10000000, 3000000, 6000000); + return mode; +} + +WifiMode +WifiPhy::Get4_5mb10Mhz (void) +{ + static WifiMode mode = WifiModeFactory::CreateBpsk ("wifi-4.5mbs-10Mhz", + false, + 10000000, 4500000, 6000000); + return mode; +} + +WifiMode +WifiPhy::Get6mb10Mhz (void) +{ + static WifiMode mode = WifiModeFactory::CreateBpsk ("wifi-6mbs-10Mhz", + true, + 10000000, 6000000, 12000000); + return mode; +} + +WifiMode +WifiPhy::Get9mb10Mhz (void) +{ + static WifiMode mode = WifiModeFactory::CreateBpsk ("wifi-9mbs-10Mhz", + false, + 10000000, 9000000, 12000000); + return mode; +} + +WifiMode +WifiPhy::Get12mb10Mhz (void) +{ + static WifiMode mode = WifiModeFactory::CreateBpsk ("wifi-12mbs-10Mhz", + true, + 10000000, 12000000, 24000000); + return mode; +} + +WifiMode +WifiPhy::Get18mb10Mhz (void) +{ + static WifiMode mode = WifiModeFactory::CreateBpsk ("wifi-18mbs-10Mhz", + false, + 10000000, 18000000, 24000000); + return mode; +} + +WifiMode +WifiPhy::Get24mb10Mhz (void) +{ + static WifiMode mode = WifiModeFactory::CreateBpsk ("wifi-24mbs-10Mhz", + false, + 10000000, 24000000, 36000000); + return mode; +} + +WifiMode +WifiPhy::Get27mb10Mhz (void) +{ + static WifiMode mode = WifiModeFactory::CreateBpsk ("wifi-27mbs-10Mhz", + false, + 10000000, 27000000, 36000000); + return mode; +} + +WifiMode +WifiPhy::Get1_5mb5Mhz (void) +{ + static WifiMode mode = WifiModeFactory::CreateBpsk ("wifi-1_5mbs-5Mhz", + true, + 5000000, 1500000, 3000000); + return mode; +} + +WifiMode +WifiPhy::Get2_25mb5Mhz (void) +{ + static WifiMode mode = WifiModeFactory::CreateBpsk ("wifi-2.25mbs-5Mhz", + false, + 5000000, 2250000, 3000000); + return mode; +} + +WifiMode +WifiPhy::Get3mb5Mhz (void) +{ + static WifiMode mode = WifiModeFactory::CreateBpsk ("wifi-3mbs-5Mhz", + true, + 5000000, 3000000, 6000000); + return mode; +} + +WifiMode +WifiPhy::Get4_5mb5Mhz (void) +{ + static WifiMode mode = WifiModeFactory::CreateBpsk ("wifi-4.5mbs-5Mhz", + false, + 5000000, 4500000, 6000000); + return mode; +} + +WifiMode +WifiPhy::Get6mb5Mhz (void) +{ + static WifiMode mode = WifiModeFactory::CreateBpsk ("wifi-6mbs-5Mhz", + true, + 5000000, 6000000, 12000000); + return mode; +} + +WifiMode +WifiPhy::Get9mb5Mhz (void) +{ + static WifiMode mode = WifiModeFactory::CreateBpsk ("wifi-9mbs-5Mhz", + false, + 10000000, 9000000, 12000000); + return mode; +} + +WifiMode +WifiPhy::Get12mb5Mhz (void) +{ + static WifiMode mode = WifiModeFactory::CreateBpsk ("wifi-12mbs-5Mhz", + false, + 10000000, 12000000, 18000000); + return mode; +} + +WifiMode +WifiPhy::Get13_5mb5Mhz (void) +{ + static WifiMode mode = WifiModeFactory::CreateBpsk ("wifi-13.5mbs-5Mhz", + false, + 10000000, 13500000, 18000000); + return mode; +} + } // namespace ns3 @@ -265,6 +409,22 @@ public: ns3::WifiPhy::Get2mbb (); ns3::WifiPhy::Get5_5mbb (); ns3::WifiPhy::Get11mbb (); + ns3::WifiPhy::Get3mb10Mhz (); + ns3::WifiPhy::Get4_5mb10Mhz (); + ns3::WifiPhy::Get6mb10Mhz (); + ns3::WifiPhy::Get9mb10Mhz (); + ns3::WifiPhy::Get12mb10Mhz (); + ns3::WifiPhy::Get18mb10Mhz (); + ns3::WifiPhy::Get24mb10Mhz (); + ns3::WifiPhy::Get27mb10Mhz (); + ns3::WifiPhy::Get1_5mb5Mhz (); + ns3::WifiPhy::Get2_25mb5Mhz (); + ns3::WifiPhy::Get3mb5Mhz (); + ns3::WifiPhy::Get4_5mb5Mhz (); + ns3::WifiPhy::Get6mb5Mhz (); + ns3::WifiPhy::Get9mb5Mhz (); + ns3::WifiPhy::Get12mb5Mhz (); + ns3::WifiPhy::Get13_5mb5Mhz (); } } g_constructor; } diff --git a/src/devices/wifi/wifi-phy.h b/src/devices/wifi/wifi-phy.h index e061827a9..2da58de60 100644 --- a/src/devices/wifi/wifi-phy.h +++ b/src/devices/wifi/wifi-phy.h @@ -256,6 +256,22 @@ public: static WifiMode Get2mbb (void); static WifiMode Get5_5mbb (void); static WifiMode Get11mbb (void); + static WifiMode Get3mb10Mhz (void); + static WifiMode Get4_5mb10Mhz (void); + static WifiMode Get6mb10Mhz (void); + static WifiMode Get9mb10Mhz (void); + static WifiMode Get12mb10Mhz (void); + static WifiMode Get18mb10Mhz (void); + static WifiMode Get24mb10Mhz (void); + static WifiMode Get27mb10Mhz (void); + static WifiMode Get1_5mb5Mhz (void); + static WifiMode Get2_25mb5Mhz (void); + static WifiMode Get3mb5Mhz (void); + static WifiMode Get4_5mb5Mhz (void); + static WifiMode Get6mb5Mhz (void); + static WifiMode Get9mb5Mhz (void); + static WifiMode Get12mb5Mhz (void); + static WifiMode Get13_5mb5Mhz (void); /** diff --git a/src/devices/wifi/yans-error-rate-model.cc b/src/devices/wifi/yans-error-rate-model.cc index 17272cd47..e51ac3353 100644 --- a/src/devices/wifi/yans-error-rate-model.cc +++ b/src/devices/wifi/yans-error-rate-model.cc @@ -176,7 +176,7 @@ YansErrorRateModel::GetFecQamBer (double snr, uint32_t nbits, double YansErrorRateModel::GetChunkSuccessRate (WifiMode mode, double snr, uint32_t nbits) const { - if (mode == WifiPhy::Get6mba ()) + if (mode == WifiPhy::Get6mba () || mode == WifiPhy::Get3mb10Mhz () || mode == WifiPhy::Get1_5mb5Mhz ()) { return GetFecBpskBer (snr, nbits, @@ -186,7 +186,7 @@ YansErrorRateModel::GetChunkSuccessRate (WifiMode mode, double snr, uint32_t nbi 11 // adFree ); } - else if (mode == WifiPhy::Get9mba ()) + else if (mode == WifiPhy::Get9mba () || mode == WifiPhy::Get4_5mb10Mhz () || mode == WifiPhy::Get2_25mb5Mhz ()) { return GetFecBpskBer (snr, nbits, @@ -196,7 +196,7 @@ YansErrorRateModel::GetChunkSuccessRate (WifiMode mode, double snr, uint32_t nbi 8 // adFree ); } - else if (mode == WifiPhy::Get12mba ()) + else if (mode == WifiPhy::Get12mba () || mode == WifiPhy::Get6mb10Mhz () || mode == WifiPhy::Get3mb5Mhz ()) { return GetFecQamBer (snr, nbits, @@ -208,7 +208,7 @@ YansErrorRateModel::GetChunkSuccessRate (WifiMode mode, double snr, uint32_t nbi 0 // adFreePlusOne ); } - else if (mode == WifiPhy::Get18mba ()) + else if (mode == WifiPhy::Get18mba () || mode == WifiPhy::Get9mb10Mhz () || mode == WifiPhy::Get4_5mb5Mhz ()) { return GetFecQamBer (snr, nbits, @@ -220,7 +220,7 @@ YansErrorRateModel::GetChunkSuccessRate (WifiMode mode, double snr, uint32_t nbi 31 // adFreePlusOne ); } - else if (mode == WifiPhy::Get24mba ()) + else if (mode == WifiPhy::Get24mba () || mode == WifiPhy::Get12mb10Mhz () || mode == WifiPhy::Get6mb5Mhz ()) { return GetFecQamBer (snr, nbits, @@ -232,7 +232,7 @@ YansErrorRateModel::GetChunkSuccessRate (WifiMode mode, double snr, uint32_t nbi 0 // adFreePlusOne ); } - else if (mode == WifiPhy::Get36mba ()) + else if (mode == WifiPhy::Get36mba () || mode == WifiPhy::Get18mb10Mhz () || mode == WifiPhy::Get9mb5Mhz ()) { return GetFecQamBer (snr, nbits, @@ -244,7 +244,7 @@ YansErrorRateModel::GetChunkSuccessRate (WifiMode mode, double snr, uint32_t nbi 31 // adFreePlusOne ); } - else if (mode == WifiPhy::Get48mba ()) + else if (mode == WifiPhy::Get48mba () || mode == WifiPhy::Get24mb10Mhz () || mode == WifiPhy::Get12mb5Mhz ()) { return GetFecQamBer (snr, nbits, @@ -256,7 +256,7 @@ YansErrorRateModel::GetChunkSuccessRate (WifiMode mode, double snr, uint32_t nbi 16 // adFreePlusOne ); } - else if (mode == WifiPhy::Get54mba ()) + else if (mode == WifiPhy::Get54mba () || mode == WifiPhy::Get27mb10Mhz () || mode == WifiPhy::Get13_5mb5Mhz ()) { return GetFecQamBer (snr, nbits, diff --git a/src/devices/wifi/yans-wifi-phy.cc b/src/devices/wifi/yans-wifi-phy.cc index 389a631f6..a7c6007e3 100644 --- a/src/devices/wifi/yans-wifi-phy.cc +++ b/src/devices/wifi/yans-wifi-phy.cc @@ -111,6 +111,8 @@ YansWifiPhy::GetTypeId (void) MakeEnumAccessor (&YansWifiPhy::SetStandard), MakeEnumChecker (WIFI_PHY_STANDARD_80211a, "802.11a", WIFI_PHY_STANDARD_80211b, "802.11b", + WIFI_PHY_STANDARD_80211_10Mhz,"802.11_10Mhz", + WIFI_PHY_STANDARD_80211_5Mhz,"802-11_5Mhz", WIFI_PHY_STANDARD_holland, "holland")) .AddAttribute ("State", "The state of the PHY layer", PointerValue (), @@ -156,6 +158,12 @@ YansWifiPhy::SetStandard (enum WifiPhyStandard standard) case WIFI_PHY_STANDARD_80211b: Configure80211b (); break; + case WIFI_PHY_STANDARD_80211_10Mhz: + Configure80211_10Mhz (); + break; + case WIFI_PHY_STANDARD_80211_5Mhz: + Configure80211_5Mhz (); + break; case WIFI_PHY_STANDARD_holland: ConfigureHolland (); break; @@ -460,6 +468,36 @@ YansWifiPhy::Configure80211b (void) m_modes.push_back (WifiPhy::Get11mbb ()); } +void +YansWifiPhy::Configure80211_10Mhz (void) +{ + NS_LOG_FUNCTION (this); + m_interference.Configure80211_10MhzParameters (); + m_modes.push_back (WifiPhy::Get3mb10Mhz ()); + m_modes.push_back (WifiPhy::Get4_5mb10Mhz ()); + m_modes.push_back (WifiPhy::Get6mb10Mhz ()); + m_modes.push_back (WifiPhy::Get9mb10Mhz ()); + m_modes.push_back (WifiPhy::Get12mb10Mhz ()); + m_modes.push_back (WifiPhy::Get18mb10Mhz ()); + m_modes.push_back (WifiPhy::Get24mb10Mhz ()); + m_modes.push_back (WifiPhy::Get27mb10Mhz ()); +} + +void +YansWifiPhy::Configure80211_5Mhz (void) +{ + NS_LOG_FUNCTION (this); + m_interference.Configure80211_5MhzParameters (); + m_modes.push_back (WifiPhy::Get1_5mb5Mhz ()); + m_modes.push_back (WifiPhy::Get2_25mb5Mhz ()); + m_modes.push_back (WifiPhy::Get3mb5Mhz ()); + m_modes.push_back (WifiPhy::Get4_5mb5Mhz ()); + m_modes.push_back (WifiPhy::Get6mb5Mhz ()); + m_modes.push_back (WifiPhy::Get9mb5Mhz ()); + m_modes.push_back (WifiPhy::Get12mb5Mhz ()); + m_modes.push_back (WifiPhy::Get13_5mb5Mhz ()); +} + void YansWifiPhy::ConfigureHolland (void) { diff --git a/src/devices/wifi/yans-wifi-phy.h b/src/devices/wifi/yans-wifi-phy.h index 52c5bfb1d..56357177a 100644 --- a/src/devices/wifi/yans-wifi-phy.h +++ b/src/devices/wifi/yans-wifi-phy.h @@ -125,6 +125,8 @@ private: virtual void DoDispose (void); void Configure80211a (void); void Configure80211b (void); + void Configure80211_10Mhz (void); + void Configure80211_5Mhz (); void ConfigureHolland (void); double GetEdThresholdW (void) const; double DbmToW (double dbm) const; From 9028ab74c92b493dd14200ee01229591b5c206f6 Mon Sep 17 00:00:00 2001 From: Mathieu Lacage Date: Wed, 15 Jul 2009 08:36:41 +0200 Subject: [PATCH 41/46] make sure memory is initialized --- utils/bench-simulator.cc | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/utils/bench-simulator.cc b/utils/bench-simulator.cc index 75eeda668..8a3011ec1 100644 --- a/utils/bench-simulator.cc +++ b/utils/bench-simulator.cc @@ -33,6 +33,7 @@ bool g_debug = false; class Bench { public: + Bench (); void ReadDistribution (std::istream &istream); void SetTotal (uint32_t total); void RunBench (void); @@ -44,6 +45,11 @@ private: uint32_t m_total; }; +Bench::Bench () + : m_n (0), + m_total (0) +{} + void Bench::SetTotal (uint32_t total) { From 85f7e477a88d54b3d17292ccb6e8a17adec66e0d Mon Sep 17 00:00:00 2001 From: Nicola Baldo Date: Wed, 15 Jul 2009 13:06:11 +0200 Subject: [PATCH 42/46] made InterferenceHelper::CalculateTxDuration () static --- CHANGES.html | 33 ++ .../interference-helper-tx-duration-test.cc | 193 ++++++++++++ src/devices/wifi/interference-helper.cc | 282 +++++++++++------- src/devices/wifi/interference-helper.h | 18 +- src/devices/wifi/wifi-mode.cc | 22 +- src/devices/wifi/wifi-mode.h | 20 +- src/devices/wifi/wifi-phy.cc | 84 ++++-- src/devices/wifi/wscript | 1 + src/devices/wifi/yans-wifi-phy.cc | 7 +- 9 files changed, 501 insertions(+), 159 deletions(-) create mode 100644 src/devices/wifi/interference-helper-tx-duration-test.cc diff --git a/CHANGES.html b/CHANGES.html index de84ea1b5..fccd13632 100644 --- a/CHANGES.html +++ b/CHANGES.html @@ -43,6 +43,39 @@ the cracks, unfortunately. If you, as a user, can suggest improvements to this file based on your experience, please contribute a patch or drop us a note on ns-developers mailing list.

    +
    +

    Changes from ns-3.5 to ns-3.6

    + +

    Changes to build system:

    +
      +
    + +

    New API:

    +
      +
    + +

    Changes to existing API:

    +
      +
    • InterferenceHelper +

      The method InterferenceHelper::CalculateTxDuration (uint32_t size, WifiMode payloadMode, WifiPreamble preamble) has been made static, so that the frame duration depends only on the characteristics of the frame (i.e., the function parameters) and not on the particular standard which is used by the receiving PHY. This makes it now possible to correctly calculate the duration of incoming frames in scenarios in which devices using different PHY configurations coexist in the same channel (e.g., a BSS using short preamble and another BSS using long preamble).

      +

      The following member methods have been added to InterferenceHelper:

      +
      +  static WifiMode GetPlcpHeaderMode (WifiMode, WifiPreamble);
+  static uint32_t GetPlcpHeaderDurationMicroSeconds (WifiMode, WifiPreamble);
+  static uint32_t GetPlcpPreambleDurationMicroSeconds (WifiMode, WifiPreamble);
+  static uint32_t GetPayloadDurationMicroSeconds (size, WifiMode);
      +

      The following member methods have been removed from InterferenceHelper:

      +
      +  void Configure80211aParameters (void);
+  void Configure80211bParameters (void);
+  void Configure80211_10MhzParameters (void);
+  void Configure80211_5MhzParameters (void);
      +
      • +
    • WifiMode +

      WifiMode now has a WifiPhyStandard attribute which identifies the standard the WifiMode belongs to. To properly set this attribute when creating a new WifiMode, it is now required to explicitly pass a WifiPhyStandard parameter to all WifiModeFactory::CreateXXXX() methods. The WifiPhyStandard value of an existing WifiMode can be retrieved using the new method WifiMode::GetStandard().

      +
      • +
    +

    Changes from ns-3.4 to ns-3.5

    diff --git a/src/devices/wifi/interference-helper-tx-duration-test.cc b/src/devices/wifi/interference-helper-tx-duration-test.cc new file mode 100644 index 000000000..6a05b5611 --- /dev/null +++ b/src/devices/wifi/interference-helper-tx-duration-test.cc @@ -0,0 +1,193 @@ +/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* + * Copyright (c) 2009 CTTC + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation; + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * Author: Nicola Baldo + */ + +#include +#include +#include +#include +#include"interference-helper.h" +#include"wifi-phy.h" + +NS_LOG_COMPONENT_DEFINE ("InterferenceHelperTxDurationTest"); + + +#ifdef RUN_SELF_TESTS + + +namespace ns3 { + +class InterferenceHelperTxDurationTest : public Test { +public: + InterferenceHelperTxDurationTest (); + virtual ~InterferenceHelperTxDurationTest (); + virtual bool RunTests (void); + +private: + + /** + * Check if the payload tx duration returned by InterferenceHelper + * corresponds to a known value of the pay + * + * @param size size of payload in octets (includes everything after the PLCP header) + * @param payloadMode the WifiMode used + * @param knownPlcpLengthFieldValue the known value of the Length field in the PLCP header + * + * @return true if values correspond, false otherwise + */ + bool CheckPayloadDuration(uint32_t size, WifiMode payloadMode, uint32_t knownDurationMicroSeconds); + + /** + * Check if the overall tx duration returned by InterferenceHelper + * corresponds to a known value of the pay + * + * @param size size of payload in octets (includes everything after the PLCP header) + * @param payloadMode the WifiMode used + * @param preamble the WifiPreamble used + * @param knownPlcpLengthFieldValue the known value of the Length field in the PLCP header + * + * @return true if values correspond, false otherwise + */ + bool CheckTxDuration(uint32_t size, WifiMode payloadMode, WifiPreamble preamble, uint32_t knownDurationMicroSeconds); + +}; + + +// we need to create one instance of InterferenceHelperTxDurationTest +static InterferenceHelperTxDurationTest interferenceHelperTxDurationTestInstance; + + +InterferenceHelperTxDurationTest::InterferenceHelperTxDurationTest () + : Test ("InterferenceHelperTxDuration") +{ +} + + +InterferenceHelperTxDurationTest::~InterferenceHelperTxDurationTest () +{ +} + + + +bool +InterferenceHelperTxDurationTest::CheckPayloadDuration(uint32_t size, WifiMode payloadMode, uint32_t knownDurationMicroSeconds) +{ + uint32_t calculatedDurationMicroSeconds = InterferenceHelper::GetPayloadDurationMicroSeconds (size, payloadMode); + if (calculatedDurationMicroSeconds != knownDurationMicroSeconds) + { + std::cerr << " size=" << size + << " mode=" << payloadMode + << " known=" << knownDurationMicroSeconds + << " calculated=" << calculatedDurationMicroSeconds + << std::endl; + return false; + } + return true; +} + +bool +InterferenceHelperTxDurationTest::CheckTxDuration(uint32_t size, WifiMode payloadMode, WifiPreamble preamble, uint32_t knownDurationMicroSeconds) +{ + uint32_t calculatedDurationMicroSeconds = InterferenceHelper::CalculateTxDuration (size, payloadMode, preamble).GetMicroSeconds (); + if (calculatedDurationMicroSeconds != knownDurationMicroSeconds) + { + std::cerr << " size=" << size + << " mode=" << payloadMode + << " preamble=" << preamble + << " known=" << knownDurationMicroSeconds + << " calculated=" << calculatedDurationMicroSeconds + << std::endl; + return false; + } + return true; +} + +bool +InterferenceHelperTxDurationTest::RunTests (void) +{ + bool retval = true; + + // IEEE Std 802.11-2007 Table 18-2 "Example of LENGTH calculations for CCK" + retval = retval + && CheckPayloadDuration (1023, WifiPhy::Get11mbb (), 744) + && CheckPayloadDuration (1024, WifiPhy::Get11mbb (), 745) + && CheckPayloadDuration (1025, WifiPhy::Get11mbb (), 746) + && CheckPayloadDuration (1026, WifiPhy::Get11mbb (), 747); + + + // Similar, but we add PLCP preamble and header durations + // and we test different rates. + // The payload durations for modes other than 11mbb have been + // calculated by hand according to IEEE Std 802.11-2007 18.2.3.5 + retval = retval + && CheckTxDuration (1023, WifiPhy::Get11mbb (), WIFI_PREAMBLE_SHORT, 744 + 96) + && CheckTxDuration (1024, WifiPhy::Get11mbb (), WIFI_PREAMBLE_SHORT, 745 + 96) + && CheckTxDuration (1025, WifiPhy::Get11mbb (), WIFI_PREAMBLE_SHORT, 746 + 96) + && CheckTxDuration (1026, WifiPhy::Get11mbb (), WIFI_PREAMBLE_SHORT, 747 + 96) + && CheckTxDuration (1023, WifiPhy::Get11mbb (), WIFI_PREAMBLE_LONG, 744 + 192) + && CheckTxDuration (1024, WifiPhy::Get11mbb (), WIFI_PREAMBLE_LONG, 745 + 192) + && CheckTxDuration (1025, WifiPhy::Get11mbb (), WIFI_PREAMBLE_LONG, 746 + 192) + && CheckTxDuration (1026, WifiPhy::Get11mbb (), WIFI_PREAMBLE_LONG, 747 + 192) + && CheckTxDuration (1023, WifiPhy::Get5_5mbb (), WIFI_PREAMBLE_SHORT, 1488 + 96) + && CheckTxDuration (1024, WifiPhy::Get5_5mbb (), WIFI_PREAMBLE_SHORT, 1490 + 96) + && CheckTxDuration (1025, WifiPhy::Get5_5mbb (), WIFI_PREAMBLE_SHORT, 1491 + 96) + && CheckTxDuration (1026, WifiPhy::Get5_5mbb (), WIFI_PREAMBLE_SHORT, 1493 + 96) + && CheckTxDuration (1023, WifiPhy::Get5_5mbb (), WIFI_PREAMBLE_LONG, 1488 + 192) + && CheckTxDuration (1024, WifiPhy::Get5_5mbb (), WIFI_PREAMBLE_LONG, 1490 + 192) + && CheckTxDuration (1025, WifiPhy::Get5_5mbb (), WIFI_PREAMBLE_LONG, 1491 + 192) + && CheckTxDuration (1026, WifiPhy::Get5_5mbb (), WIFI_PREAMBLE_LONG, 1493 + 192) + && CheckTxDuration (1023, WifiPhy::Get2mbb (), WIFI_PREAMBLE_SHORT, 4092 + 96) + && CheckTxDuration (1024, WifiPhy::Get2mbb (), WIFI_PREAMBLE_SHORT, 4096 + 96) + && CheckTxDuration (1025, WifiPhy::Get2mbb (), WIFI_PREAMBLE_SHORT, 4100 + 96) + && CheckTxDuration (1026, WifiPhy::Get2mbb (), WIFI_PREAMBLE_SHORT, 4104 + 96) + && CheckTxDuration (1023, WifiPhy::Get2mbb (), WIFI_PREAMBLE_LONG, 4092 + 192) + && CheckTxDuration (1024, WifiPhy::Get2mbb (), WIFI_PREAMBLE_LONG, 4096 + 192) + && CheckTxDuration (1025, WifiPhy::Get2mbb (), WIFI_PREAMBLE_LONG, 4100 + 192) + && CheckTxDuration (1026, WifiPhy::Get2mbb (), WIFI_PREAMBLE_LONG, 4104 + 192) + && CheckTxDuration (1023, WifiPhy::Get1mbb (), WIFI_PREAMBLE_SHORT, 8184 + 96) + && CheckTxDuration (1024, WifiPhy::Get1mbb (), WIFI_PREAMBLE_SHORT, 8192 + 96) + && CheckTxDuration (1025, WifiPhy::Get1mbb (), WIFI_PREAMBLE_SHORT, 8200 + 96) + && CheckTxDuration (1026, WifiPhy::Get1mbb (), WIFI_PREAMBLE_SHORT, 8208 + 96) + && CheckTxDuration (1023, WifiPhy::Get1mbb (), WIFI_PREAMBLE_LONG, 8184 + 192) + && CheckTxDuration (1024, WifiPhy::Get1mbb (), WIFI_PREAMBLE_LONG, 8192 + 192) + && CheckTxDuration (1025, WifiPhy::Get1mbb (), WIFI_PREAMBLE_LONG, 8200 + 192) + && CheckTxDuration (1026, WifiPhy::Get1mbb (), WIFI_PREAMBLE_LONG, 8208 + 192); + + // values from http://mailman.isi.edu/pipermail/ns-developers/2009-July/006226.html + retval = retval && CheckTxDuration (14, WifiPhy::Get1mbb (), WIFI_PREAMBLE_LONG, 304); + + // values from + // http://www.oreillynet.com/pub/a/wireless/2003/08/08/wireless_throughput.html + retval = retval + && CheckTxDuration (1536, WifiPhy::Get11mbb (), WIFI_PREAMBLE_LONG, 1310) + && CheckTxDuration (76, WifiPhy::Get11mbb (), WIFI_PREAMBLE_LONG, 248) + && CheckTxDuration (14, WifiPhy::Get11mbb (), WIFI_PREAMBLE_LONG, 203) + && CheckTxDuration (1536, WifiPhy::Get54mba (), WIFI_PREAMBLE_LONG, 248) + && CheckTxDuration (76, WifiPhy::Get54mba (), WIFI_PREAMBLE_LONG, 32) + && CheckTxDuration (14, WifiPhy::Get54mba (), WIFI_PREAMBLE_LONG, 24); + + + return retval; +} + + +} //namespace ns3 + + +#endif /* RUN_SELF_TESTS */ diff --git a/src/devices/wifi/interference-helper.cc b/src/devices/wifi/interference-helper.cc index a9dec5c10..32d9d194a 100644 --- a/src/devices/wifi/interference-helper.cc +++ b/src/devices/wifi/interference-helper.cc @@ -123,8 +123,8 @@ InterferenceHelper::NiChange::operator < (InterferenceHelper::NiChange const &o) ****************************************************************/ InterferenceHelper::InterferenceHelper () - : m_80211_standard (WIFI_PHY_STANDARD_80211a), - m_errorRateModel (0) + : m_maxPacketDuration (Seconds(0)), + m_errorRateModel (0) {} InterferenceHelper::~InterferenceHelper () { @@ -145,6 +145,7 @@ InterferenceHelper::Add (uint32_t size, WifiMode payloadMode, duration, rxPowerW); + m_maxPacketDuration = std::max(duration, m_maxPacketDuration); AppendEvent (event); return event; } @@ -224,97 +225,183 @@ InterferenceHelper::GetEnergyDuration (double energyW) return end - now; } -Time -InterferenceHelper::CalculateTxDuration (uint32_t size, WifiMode payloadMode, WifiPreamble preamble) const +WifiMode +InterferenceHelper::GetPlcpHeaderMode (WifiMode payloadMode, WifiPreamble preamble) { - uint64_t delay = 0; - switch (m_80211_standard) - { + switch (payloadMode.GetStandard ()) + { + case WIFI_PHY_STANDARD_holland: + case WIFI_PHY_STANDARD_80211a: + // IEEE Std 802.11-2007, 17.3.2 + // actually this is only the first part of the PlcpHeader, + // because the last 16 bits of the PlcpHeader are using the + // same mode of the payload + return WifiPhy::Get6mba (); + + case WIFI_PHY_STANDARD_80211b: + if (preamble == WIFI_PREAMBLE_LONG) + { + // IEEE Std 802.11-2007, sections 15.2.3 and 18.2.2.1 + return WifiPhy::Get1mbb (); + } + else // WIFI_PREAMBLE_SHORT + { + // IEEE Std 802.11-2007, section 18.2.2.2 + return WifiPhy::Get2mbb (); + } + + case WIFI_PHY_STANDARD_80211_10Mhz: + return WifiPhy::Get3mb10Mhz (); + + case WIFI_PHY_STANDARD_80211_5Mhz: + return WifiPhy::Get1_5mb5Mhz (); + + default: + NS_FATAL_ERROR("unknown standard"); + return WifiMode (); + } +} + +uint32_t +InterferenceHelper::GetPlcpHeaderDurationMicroSeconds (WifiMode payloadMode, WifiPreamble preamble) +{ + switch (payloadMode.GetStandard ()) + { + case WIFI_PHY_STANDARD_holland: + case WIFI_PHY_STANDARD_80211a: + // IEEE Std 802.11-2007, section 17.3.3 and figure 17-4 + // also section 17.3.2.3, table 17-4 + // We return the duration of the SIGNAL field only, since the + // SERVICE field (which strictly speaking belongs to the PLCP + // header, see section 17.3.2 and figure 17-1) is sent using the + // payload mode. + return 4; + + case WIFI_PHY_STANDARD_80211_10Mhz: + // IEEE Std 802.11-2007, section 17.3.2.3, table 17-4 + return 8; + + case WIFI_PHY_STANDARD_80211_5Mhz: + // IEEE Std 802.11-2007, section 17.3.2.3, table 17-4 + return 16; + + case WIFI_PHY_STANDARD_80211b: + if (preamble == WIFI_PREAMBLE_SHORT) + { + // IEEE Std 802.11-2007, section 18.2.2.2 and figure 18-2 + return 24; + } + else // WIFI_PREAMBLE_LONG + { + // IEEE Std 802.11-2007, sections 18.2.2.1 and figure 18-1 + return 48; + } + + default: + NS_FATAL_ERROR("unknown standard"); + return 0; + } + +} + +uint32_t +InterferenceHelper::GetPlcpPreambleDurationMicroSeconds (WifiMode payloadMode, WifiPreamble preamble) +{ + switch (payloadMode.GetStandard ()) + { + case WIFI_PHY_STANDARD_holland: + case WIFI_PHY_STANDARD_80211a: + // IEEE Std 802.11-2007, section 17.3.3, figure 17-4 + // also section 17.3.2.3, table 17-4 + return 16; + + case WIFI_PHY_STANDARD_80211_10Mhz: + // IEEE Std 802.11-2007, section 17.3.3, table 17-4 + // also section 17.3.2.3, table 17-4 + return 32; + + case WIFI_PHY_STANDARD_80211_5Mhz: + // IEEE Std 802.11-2007, section 17.3.3 + // also section 17.3.2.3, table 17-4 + return 64; + + case WIFI_PHY_STANDARD_80211b: + if (preamble == WIFI_PREAMBLE_SHORT) + { + // IEEE Std 802.11-2007, section 18.2.2.2 and figure 18-2 + return 72; + } + else // WIFI_PREAMBLE_LONG + { + // IEEE Std 802.11-2007, sections 18.2.2.1 and figure 18-1 + return 144; + } + + default: + NS_FATAL_ERROR("unknown standard"); + return 0; + } +} + +uint32_t +InterferenceHelper::GetPayloadDurationMicroSeconds (uint32_t size, WifiMode payloadMode) +{ + NS_LOG_FUNCTION(size << payloadMode); + switch (payloadMode.GetStandard ()) + { case WIFI_PHY_STANDARD_80211a: case WIFI_PHY_STANDARD_holland: - delay += m_plcpLongPreambleDelayUs; - // symbol duration is 4us - delay += 4; - delay += lrint (ceil ((size * 8.0 + 16.0 + 6.0) / payloadMode.GetDataRate () / 4e-6) * 4); - break; - case WIFI_PHY_STANDARD_80211b: - delay += m_plcpLongPreambleDelayUs; - delay += lrint (ceil ((size * 8.0 + 48.0) / payloadMode.GetDataRate () / 4e-6) * 4); - break; case WIFI_PHY_STANDARD_80211_10Mhz: - delay += m_plcpLongPreambleDelayUs; - // symbol duration is 8us - delay += 8; - delay += lrint (ceil ((size * 8.0 + 16.0 + 6.0) / payloadMode.GetDataRate () / 8e-6) * 8); - break; case WIFI_PHY_STANDARD_80211_5Mhz: - delay += m_plcpLongPreambleDelayUs; - // symbol duration is 16us - delay += 16; - delay += lrint (ceil ((size * 8.0 + 16.0 + 6.0) / payloadMode.GetDataRate () / 1.6e-5) * 16); - break; + { + // IEEE Std 802.11-2007, section 17.3.2.3, table 17-4 + // corresponds to T_{SYM} in the table + uint32_t symbolDurationUs; + switch (payloadMode.GetStandard ()) + { + case WIFI_PHY_STANDARD_holland: + case WIFI_PHY_STANDARD_80211a: + symbolDurationUs = 4; + break; + case WIFI_PHY_STANDARD_80211_10Mhz: + symbolDurationUs = 8; + break; + case WIFI_PHY_STANDARD_80211_5Mhz: + symbolDurationUs = 16; + break; + default: + NS_FATAL_ERROR("unknown standard"); + } + + // IEEE Std 802.11-2007, section 17.3.2.2, table 17-3 + // corresponds to N_{DBPS} in the table + double numDataBitsPerSymbol = payloadMode.GetDataRate () * symbolDurationUs / 1e6; + + // IEEE Std 802.11-2007, section 17.3.5.3, equation (17-11) + uint32_t numSymbols = ceil ((16 + size * 8.0 + 6.0)/numDataBitsPerSymbol); + + return numSymbols*symbolDurationUs; + } + case WIFI_PHY_STANDARD_80211b: + // IEEE Std 802.11-2007, section 18.2.3.5 + NS_LOG_LOGIC(" size=" << size + << " mode=" << payloadMode + << " rate=" << payloadMode.GetDataRate () ); + return ceil ((size * 8.0) / (payloadMode.GetDataRate () / 1.0e6)); + default: - NS_ASSERT (false); - break; - } - - return MicroSeconds (delay); + NS_FATAL_ERROR("unknown standard"); + return 0; + } } -void -InterferenceHelper::Configure80211aParameters (void) +Time +InterferenceHelper::CalculateTxDuration (uint32_t size, WifiMode payloadMode, WifiPreamble preamble) { - NS_LOG_FUNCTION (this); - m_80211_standard = WIFI_PHY_STANDARD_80211a; - m_plcpLongPreambleDelayUs = 16; - m_plcpShortPreambleDelayUs = 16; - m_longPlcpHeaderMode = WifiPhy::Get6mba (); - m_shortPlcpHeaderMode = WifiPhy::Get6mba (); - m_plcpHeaderLength = 4 + 1 + 12 + 1 + 6; - /* 4095 bytes at a 6Mb/s rate with a 1/2 coding rate. */ - m_maxPacketDuration = CalculateTxDuration (4095, WifiPhy::Get6mba (), WIFI_PREAMBLE_LONG); -} - -void -InterferenceHelper::Configure80211bParameters (void) -{ - NS_LOG_FUNCTION (this); - m_80211_standard = WIFI_PHY_STANDARD_80211b; - m_plcpLongPreambleDelayUs = 144; - m_plcpShortPreambleDelayUs = 144; // fixed preamable for 802.11b - m_longPlcpHeaderMode = WifiPhy::Get1mbb (); - m_shortPlcpHeaderMode = WifiPhy::Get1mbb (); - // PLCP Header: signal 8, service 8, length 16, CRC 16 bits - m_plcpHeaderLength = 8 + 8 + 16 + 16; - m_maxPacketDuration = CalculateTxDuration (4095, WifiPhy::Get1mbb (), WIFI_PREAMBLE_LONG); -} - -void -InterferenceHelper::Configure80211_10MhzParameters (void) -{ - NS_LOG_FUNCTION (this); - m_80211_standard = WIFI_PHY_STANDARD_80211_10Mhz; - m_plcpLongPreambleDelayUs = 32; - m_plcpShortPreambleDelayUs = 32; - m_longPlcpHeaderMode = WifiPhy::Get3mb10Mhz (); - m_shortPlcpHeaderMode = WifiPhy::Get3mb10Mhz (); - m_plcpHeaderLength = 4 + 1 + 12 + 1 + 6; - /* 4095 bytes at a 3Mb/s rate with a 1/2 coding rate. */ - m_maxPacketDuration = CalculateTxDuration (4095, WifiPhy::Get3mb10Mhz (), WIFI_PREAMBLE_LONG); -} - -void -InterferenceHelper::Configure80211_5MhzParameters (void) -{ - NS_LOG_FUNCTION (this); - m_80211_standard = WIFI_PHY_STANDARD_80211_5Mhz; - m_plcpLongPreambleDelayUs = 64; - m_plcpShortPreambleDelayUs = 64; - m_longPlcpHeaderMode = WifiPhy::Get1_5mb5Mhz (); - m_shortPlcpHeaderMode = WifiPhy::Get1_5mb5Mhz (); - m_plcpHeaderLength = 4 + 1 + 12 + 1 + 6; - /* 4095 bytes at a 1.5Mb/s rate with a 1/2 coding rate. */ - m_maxPacketDuration = CalculateTxDuration (4095, WifiPhy::Get1_5mb5Mhz (), WIFI_PREAMBLE_LONG); + uint32_t duration = GetPlcpPreambleDurationMicroSeconds (payloadMode, preamble) + + GetPlcpHeaderDurationMicroSeconds (payloadMode, preamble) + + GetPayloadDurationMicroSeconds (size, payloadMode); + return MicroSeconds (duration); } void @@ -407,29 +494,12 @@ InterferenceHelper::CalculatePer (Ptr event, Ni { double psr = 1.0; /* Packet Success Rate */ NiChanges::iterator j = ni->begin (); - Time previous = (*j).GetTime (); - uint64_t plcpPreambleDelayUs; + Time previous = (*j).GetTime (); WifiMode payloadMode = event->GetPayloadMode (); - WifiMode headerMode; - switch (event->GetPreambleType ()) { - case WIFI_PREAMBLE_LONG: - plcpPreambleDelayUs = m_plcpLongPreambleDelayUs; - headerMode = m_longPlcpHeaderMode; - break; - case WIFI_PREAMBLE_SHORT: - plcpPreambleDelayUs = m_plcpShortPreambleDelayUs; - headerMode = m_shortPlcpHeaderMode; - break; - default: - NS_ASSERT (false); - // only to quiet compiler. Really stupid. - plcpPreambleDelayUs = 0; - headerMode = m_shortPlcpHeaderMode; - break; - } - Time plcpHeaderStart = (*j).GetTime () + MicroSeconds (plcpPreambleDelayUs); - Time plcpPayloadStart = plcpHeaderStart + - Seconds ((m_plcpHeaderLength + 0.0) / headerMode.GetDataRate ()); + WifiPreamble preamble = event->GetPreambleType (); + WifiMode headerMode = GetPlcpHeaderMode (payloadMode, preamble); + Time plcpHeaderStart = (*j).GetTime () + MicroSeconds (GetPlcpPreambleDurationMicroSeconds (payloadMode, preamble)); + Time plcpPayloadStart = plcpHeaderStart + MicroSeconds (GetPlcpHeaderDurationMicroSeconds (payloadMode, preamble)); double noiseInterferenceW = (*j).GetDelta (); double powerW = event->GetRxPowerW (); diff --git a/src/devices/wifi/interference-helper.h b/src/devices/wifi/interference-helper.h index 8a1819f37..2140cb12a 100644 --- a/src/devices/wifi/interference-helper.h +++ b/src/devices/wifi/interference-helper.h @@ -69,10 +69,6 @@ public: InterferenceHelper (); ~InterferenceHelper (); - void Configure80211aParameters (void); - void Configure80211bParameters (void); - void Configure80211_10MhzParameters (void); - void Configure80211_5MhzParameters (void); void SetNoiseFigure (double value); void SetErrorRateModel (Ptr rate); @@ -87,7 +83,13 @@ public: * the requested threshold. */ Time GetEnergyDuration (double energyW); - Time CalculateTxDuration (uint32_t size, WifiMode payloadMode, WifiPreamble preamble) const; + + + static WifiMode GetPlcpHeaderMode (WifiMode payloadMode, WifiPreamble preamble); + static uint32_t GetPlcpHeaderDurationMicroSeconds (WifiMode payloadMode, WifiPreamble preamble); + static uint32_t GetPlcpPreambleDurationMicroSeconds (WifiMode mode, WifiPreamble preamble); + static uint32_t GetPayloadDurationMicroSeconds (uint32_t size, WifiMode payloadMode); + static Time CalculateTxDuration (uint32_t size, WifiMode payloadMode, WifiPreamble preamble); Ptr Add (uint32_t size, WifiMode payloadMode, enum WifiPreamble preamble, Time duration, double rxPower); @@ -116,15 +118,9 @@ private: double CalculatePer (Ptr event, NiChanges *ni) const; Time GetMaxPacketDuration (void) const; - uint64_t m_plcpLongPreambleDelayUs; - uint64_t m_plcpShortPreambleDelayUs; - WifiMode m_longPlcpHeaderMode; - WifiMode m_shortPlcpHeaderMode; - uint32_t m_plcpHeaderLength; Time m_maxPacketDuration; double m_noiseFigure; /**< noise figure (linear) */ Events m_events; - enum WifiPhyStandard m_80211_standard; Ptr m_errorRateModel; }; diff --git a/src/devices/wifi/wifi-mode.cc b/src/devices/wifi/wifi-mode.cc index 581bcb567..485551d10 100644 --- a/src/devices/wifi/wifi-mode.cc +++ b/src/devices/wifi/wifi-mode.cc @@ -107,6 +107,12 @@ WifiMode::GetUid (void) const { return m_uid; } +enum WifiPhyStandard +WifiMode::GetStandard () const +{ + struct WifiModeFactory::WifiModeItem *item = WifiModeFactory::GetFactory ()->Get (m_uid); + return item->standard; +} WifiMode::WifiMode () : m_uid (0) {} @@ -131,7 +137,8 @@ WifiModeFactory::CreateBpsk (std::string uniqueName, bool isMandatory, uint32_t bandwidth, uint32_t dataRate, - uint32_t phyRate) + uint32_t phyRate, + enum WifiPhyStandard standard) { WifiModeFactory *factory = GetFactory (); uint32_t uid = factory->AllocateUid (uniqueName); @@ -143,6 +150,7 @@ WifiModeFactory::CreateBpsk (std::string uniqueName, item->modulation = WifiMode::BPSK; item->constellationSize = 2; item->isMandatory = isMandatory; + item->standard = standard; return WifiMode (uid); } WifiMode @@ -151,7 +159,8 @@ WifiModeFactory::CreateQam (std::string uniqueName, uint32_t bandwidth, uint32_t dataRate, uint32_t phyRate, - uint8_t constellationSize) + uint8_t constellationSize, + enum WifiPhyStandard standard) { WifiModeFactory *factory = GetFactory (); uint32_t uid = factory->AllocateUid (uniqueName); @@ -163,6 +172,7 @@ WifiModeFactory::CreateQam (std::string uniqueName, item->modulation = WifiMode::QAM; item->constellationSize = constellationSize; item->isMandatory = isMandatory; + item->standard = standard; return WifiMode (uid); } WifiMode @@ -170,7 +180,8 @@ WifiModeFactory::CreateDbpsk (std::string uniqueName, bool isMandatory, uint32_t bandwidth, uint32_t dataRate, - uint32_t phyRate) + uint32_t phyRate, + enum WifiPhyStandard standard) { WifiModeFactory *factory = GetFactory (); uint32_t uid = factory->AllocateUid (uniqueName); @@ -182,6 +193,7 @@ WifiModeFactory::CreateDbpsk (std::string uniqueName, item->modulation = WifiMode::DBPSK; item->constellationSize = 2; item->isMandatory = isMandatory; + item->standard = standard; return WifiMode (uid); } WifiMode @@ -189,7 +201,8 @@ WifiModeFactory::CreateDqpsk (std::string uniqueName, bool isMandatory, uint32_t bandwidth, uint32_t dataRate, - uint32_t phyRate) + uint32_t phyRate, + enum WifiPhyStandard standard) { WifiModeFactory *factory = GetFactory (); uint32_t uid = factory->AllocateUid (uniqueName); @@ -201,6 +214,7 @@ WifiModeFactory::CreateDqpsk (std::string uniqueName, item->modulation = WifiMode::DQPSK; item->constellationSize = 4; item->isMandatory = isMandatory; + item->standard = standard; return WifiMode (uid); } bool diff --git a/src/devices/wifi/wifi-mode.h b/src/devices/wifi/wifi-mode.h index 20d707aba..a2247c540 100644 --- a/src/devices/wifi/wifi-mode.h +++ b/src/devices/wifi/wifi-mode.h @@ -25,6 +25,7 @@ #include #include #include "ns3/attribute-helper.h" +#include "ns3/wifi-phy-standard.h" namespace ns3 { @@ -101,6 +102,12 @@ class WifiMode */ uint32_t GetUid (void) const; + /** + * + * @return the WifiPhyStandard to which the WifiMode belongs + */ + enum WifiPhyStandard GetStandard () const; + /** * Create an invalid WifiMode. Calling any method on the * instance created will trigger an assert. This is useful @@ -151,7 +158,8 @@ public: bool isMandatory, uint32_t bandwidth, uint32_t dataRate, - uint32_t phyRate); + uint32_t phyRate, + enum WifiPhyStandard standard); /** * \param uniqueName the name of the associated WifiMode. This name * must be unique accross _all_ instances. @@ -170,7 +178,8 @@ public: uint32_t bandwidth, uint32_t dataRate, uint32_t phyRate, - uint8_t constellationSize); + uint8_t constellationSize, + enum WifiPhyStandard standard); /** * \param uniqueName the name of the associated WifiMode. This name @@ -188,7 +197,8 @@ public: bool isMandatory, uint32_t bandwidth, uint32_t dataRate, - uint32_t phyRate); + uint32_t phyRate, + enum WifiPhyStandard standard); /** * \param uniqueName the name of the associated WifiMode. This name * must be unique accross _all_ instances. @@ -205,7 +215,8 @@ public: bool isMandatory, uint32_t bandwidth, uint32_t dataRate, - uint32_t phyRate); + uint32_t phyRate, + enum WifiPhyStandard standard); private: friend class WifiMode; friend std::istream & operator >> (std::istream &is, WifiMode &mode); @@ -225,6 +236,7 @@ private: enum WifiMode::ModulationType modulation; uint8_t constellationSize; bool isMandatory; + enum WifiPhyStandard standard; }; bool Search (std::string name, WifiMode *mode); diff --git a/src/devices/wifi/wifi-phy.cc b/src/devices/wifi/wifi-phy.cc index 5dbf82988..949708f8a 100644 --- a/src/devices/wifi/wifi-phy.cc +++ b/src/devices/wifi/wifi-phy.cc @@ -98,7 +98,8 @@ WifiPhy::Get6mba (void) { static WifiMode mode = WifiModeFactory::CreateBpsk ("wifia-6mbs", true, - 20000000, 6000000, 12000000); + 20000000, 6000000, 12000000, + WIFI_PHY_STANDARD_80211a); return mode; } WifiMode @@ -106,7 +107,8 @@ WifiPhy::Get9mba (void) { static WifiMode mode = WifiModeFactory::CreateBpsk ("wifia-9mbs", false, - 20000000, 9000000, 12000000); + 20000000, 9000000, 12000000, + WIFI_PHY_STANDARD_80211a); return mode; } WifiMode @@ -114,7 +116,8 @@ WifiPhy::Get12mba (void) { static WifiMode mode = WifiModeFactory::CreateBpsk ("wifia-12mbs", true, - 20000000, 12000000, 24000000); + 20000000, 12000000, 24000000, + WIFI_PHY_STANDARD_80211a); return mode; } WifiMode @@ -122,7 +125,8 @@ WifiPhy::Get18mba (void) { static WifiMode mode = WifiModeFactory::CreateBpsk ("wifia-18mbs", false, - 20000000, 18000000, 24000000); + 20000000, 18000000, 24000000, + WIFI_PHY_STANDARD_80211a); return mode; } WifiMode @@ -130,7 +134,8 @@ WifiPhy::Get24mba (void) { static WifiMode mode = WifiModeFactory::CreateBpsk ("wifia-24mbs", true, - 20000000, 24000000, 48000000); + 20000000, 24000000, 48000000, + WIFI_PHY_STANDARD_80211a); return mode; } WifiMode @@ -138,7 +143,8 @@ WifiPhy::Get36mba (void) { static WifiMode mode = WifiModeFactory::CreateBpsk ("wifia-36mbs", false, - 20000000, 36000000, 48000000); + 20000000, 36000000, 48000000, + WIFI_PHY_STANDARD_80211a); return mode; } @@ -147,7 +153,8 @@ WifiPhy::Get48mba (void) { static WifiMode mode = WifiModeFactory::CreateBpsk ("wifia-48mbs", false, - 20000000, 48000000, 72000000); + 20000000, 48000000, 72000000, + WIFI_PHY_STANDARD_80211a); return mode; } @@ -156,7 +163,8 @@ WifiPhy::Get54mba (void) { static WifiMode mode = WifiModeFactory::CreateBpsk ("wifia-54mbs", false, - 20000000, 54000000, 72000000); + 20000000, 54000000, 72000000, + WIFI_PHY_STANDARD_80211a); return mode; } @@ -213,7 +221,8 @@ WifiPhy::Get1mbb (void) { static WifiMode mode = WifiModeFactory::CreateDbpsk ("wifib-1mbs", true, - 22000000, 1000000, 1000000); + 22000000, 1000000, 1000000, + WIFI_PHY_STANDARD_80211b); return mode; } @@ -222,7 +231,8 @@ WifiPhy::Get2mbb (void) { static WifiMode mode = WifiModeFactory::CreateDqpsk ("wifib-2mbs", true, - 22000000, 2000000, 2000000); + 22000000, 2000000, 2000000, + WIFI_PHY_STANDARD_80211b); return mode; } @@ -231,7 +241,8 @@ WifiPhy::Get5_5mbb (void) { static WifiMode mode = WifiModeFactory::CreateDqpsk ("wifib-5.5mbs", true, - 22000000, 5500000, 5500000); + 22000000, 5500000, 5500000, + WIFI_PHY_STANDARD_80211b); return mode; } @@ -240,7 +251,8 @@ WifiPhy::Get11mbb (void) { static WifiMode mode = WifiModeFactory::CreateDqpsk ("wifib-11mbs", true, - 22000000, 11000000, 11000000); + 22000000, 11000000, 11000000, + WIFI_PHY_STANDARD_80211b); return mode; } @@ -249,7 +261,8 @@ WifiPhy::Get3mb10Mhz (void) { static WifiMode mode = WifiModeFactory::CreateBpsk ("wifi-3mbs-10Mhz", true, - 10000000, 3000000, 6000000); + 10000000, 3000000, 6000000, + WIFI_PHY_STANDARD_80211_10Mhz); return mode; } @@ -258,7 +271,8 @@ WifiPhy::Get4_5mb10Mhz (void) { static WifiMode mode = WifiModeFactory::CreateBpsk ("wifi-4.5mbs-10Mhz", false, - 10000000, 4500000, 6000000); + 10000000, 4500000, 6000000, + WIFI_PHY_STANDARD_80211_10Mhz); return mode; } @@ -267,7 +281,8 @@ WifiPhy::Get6mb10Mhz (void) { static WifiMode mode = WifiModeFactory::CreateBpsk ("wifi-6mbs-10Mhz", true, - 10000000, 6000000, 12000000); + 10000000, 6000000, 12000000, + WIFI_PHY_STANDARD_80211_10Mhz); return mode; } @@ -276,7 +291,8 @@ WifiPhy::Get9mb10Mhz (void) { static WifiMode mode = WifiModeFactory::CreateBpsk ("wifi-9mbs-10Mhz", false, - 10000000, 9000000, 12000000); + 10000000, 9000000, 12000000, + WIFI_PHY_STANDARD_80211_10Mhz); return mode; } @@ -285,7 +301,8 @@ WifiPhy::Get12mb10Mhz (void) { static WifiMode mode = WifiModeFactory::CreateBpsk ("wifi-12mbs-10Mhz", true, - 10000000, 12000000, 24000000); + 10000000, 12000000, 24000000, + WIFI_PHY_STANDARD_80211_10Mhz); return mode; } @@ -294,7 +311,8 @@ WifiPhy::Get18mb10Mhz (void) { static WifiMode mode = WifiModeFactory::CreateBpsk ("wifi-18mbs-10Mhz", false, - 10000000, 18000000, 24000000); + 10000000, 18000000, 24000000, + WIFI_PHY_STANDARD_80211_10Mhz); return mode; } @@ -303,7 +321,8 @@ WifiPhy::Get24mb10Mhz (void) { static WifiMode mode = WifiModeFactory::CreateBpsk ("wifi-24mbs-10Mhz", false, - 10000000, 24000000, 36000000); + 10000000, 24000000, 36000000, + WIFI_PHY_STANDARD_80211_10Mhz); return mode; } @@ -312,7 +331,8 @@ WifiPhy::Get27mb10Mhz (void) { static WifiMode mode = WifiModeFactory::CreateBpsk ("wifi-27mbs-10Mhz", false, - 10000000, 27000000, 36000000); + 10000000, 27000000, 36000000, + WIFI_PHY_STANDARD_80211_10Mhz); return mode; } @@ -321,7 +341,8 @@ WifiPhy::Get1_5mb5Mhz (void) { static WifiMode mode = WifiModeFactory::CreateBpsk ("wifi-1_5mbs-5Mhz", true, - 5000000, 1500000, 3000000); + 5000000, 1500000, 3000000, + WIFI_PHY_STANDARD_80211_5Mhz); return mode; } @@ -330,7 +351,8 @@ WifiPhy::Get2_25mb5Mhz (void) { static WifiMode mode = WifiModeFactory::CreateBpsk ("wifi-2.25mbs-5Mhz", false, - 5000000, 2250000, 3000000); + 5000000, 2250000, 3000000, + WIFI_PHY_STANDARD_80211_5Mhz); return mode; } @@ -339,7 +361,8 @@ WifiPhy::Get3mb5Mhz (void) { static WifiMode mode = WifiModeFactory::CreateBpsk ("wifi-3mbs-5Mhz", true, - 5000000, 3000000, 6000000); + 5000000, 3000000, 6000000, + WIFI_PHY_STANDARD_80211_5Mhz); return mode; } @@ -348,7 +371,8 @@ WifiPhy::Get4_5mb5Mhz (void) { static WifiMode mode = WifiModeFactory::CreateBpsk ("wifi-4.5mbs-5Mhz", false, - 5000000, 4500000, 6000000); + 5000000, 4500000, 6000000, + WIFI_PHY_STANDARD_80211_5Mhz); return mode; } @@ -357,7 +381,8 @@ WifiPhy::Get6mb5Mhz (void) { static WifiMode mode = WifiModeFactory::CreateBpsk ("wifi-6mbs-5Mhz", true, - 5000000, 6000000, 12000000); + 5000000, 6000000, 12000000, + WIFI_PHY_STANDARD_80211_5Mhz); return mode; } @@ -366,7 +391,8 @@ WifiPhy::Get9mb5Mhz (void) { static WifiMode mode = WifiModeFactory::CreateBpsk ("wifi-9mbs-5Mhz", false, - 10000000, 9000000, 12000000); + 10000000, 9000000, 12000000, + WIFI_PHY_STANDARD_80211_5Mhz); return mode; } @@ -375,7 +401,8 @@ WifiPhy::Get12mb5Mhz (void) { static WifiMode mode = WifiModeFactory::CreateBpsk ("wifi-12mbs-5Mhz", false, - 10000000, 12000000, 18000000); + 10000000, 12000000, 18000000, + WIFI_PHY_STANDARD_80211_5Mhz); return mode; } @@ -384,7 +411,8 @@ WifiPhy::Get13_5mb5Mhz (void) { static WifiMode mode = WifiModeFactory::CreateBpsk ("wifi-13.5mbs-5Mhz", false, - 10000000, 13500000, 18000000); + 10000000, 13500000, 18000000, + WIFI_PHY_STANDARD_80211_5Mhz); return mode; } diff --git a/src/devices/wifi/wscript b/src/devices/wifi/wscript index cf5bb1be7..cf4a2dcbd 100644 --- a/src/devices/wifi/wscript +++ b/src/devices/wifi/wscript @@ -21,6 +21,7 @@ def build(bld): 'error-rate-model.cc', 'yans-error-rate-model.cc', 'interference-helper.cc', + 'interference-helper-tx-duration-test.cc', 'yans-wifi-phy.cc', 'yans-wifi-channel.cc', 'wifi-mac-header.cc', diff --git a/src/devices/wifi/yans-wifi-phy.cc b/src/devices/wifi/yans-wifi-phy.cc index a7c6007e3..40b1599e3 100644 --- a/src/devices/wifi/yans-wifi-phy.cc +++ b/src/devices/wifi/yans-wifi-phy.cc @@ -445,7 +445,6 @@ void YansWifiPhy::Configure80211a (void) { NS_LOG_FUNCTION (this); - m_interference.Configure80211aParameters (); m_modes.push_back (WifiPhy::Get6mba ()); m_modes.push_back (WifiPhy::Get9mba ()); m_modes.push_back (WifiPhy::Get12mba ()); @@ -461,7 +460,6 @@ void YansWifiPhy::Configure80211b (void) { NS_LOG_FUNCTION (this); - m_interference.Configure80211bParameters (); m_modes.push_back (WifiPhy::Get1mbb ()); m_modes.push_back (WifiPhy::Get2mbb ()); m_modes.push_back (WifiPhy::Get5_5mbb ()); @@ -472,7 +470,6 @@ void YansWifiPhy::Configure80211_10Mhz (void) { NS_LOG_FUNCTION (this); - m_interference.Configure80211_10MhzParameters (); m_modes.push_back (WifiPhy::Get3mb10Mhz ()); m_modes.push_back (WifiPhy::Get4_5mb10Mhz ()); m_modes.push_back (WifiPhy::Get6mb10Mhz ()); @@ -486,8 +483,7 @@ YansWifiPhy::Configure80211_10Mhz (void) void YansWifiPhy::Configure80211_5Mhz (void) { - NS_LOG_FUNCTION (this); - m_interference.Configure80211_5MhzParameters (); + NS_LOG_FUNCTION (this); m_modes.push_back (WifiPhy::Get1_5mb5Mhz ()); m_modes.push_back (WifiPhy::Get2_25mb5Mhz ()); m_modes.push_back (WifiPhy::Get3mb5Mhz ()); @@ -502,7 +498,6 @@ void YansWifiPhy::ConfigureHolland (void) { NS_LOG_FUNCTION (this); - m_interference.Configure80211aParameters (); m_modes.push_back (WifiPhy::Get6mba ()); m_modes.push_back (WifiPhy::Get12mba ()); m_modes.push_back (WifiPhy::Get18mba ()); From 52d2d61105c43f4cd1e1eb8512229bc0e18ce645 Mon Sep 17 00:00:00 2001 From: Mathieu Lacage Date: Wed, 15 Jul 2009 14:59:44 +0200 Subject: [PATCH 43/46] fix optimized build --- src/devices/wifi/interference-helper.cc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/devices/wifi/interference-helper.cc b/src/devices/wifi/interference-helper.cc index 32d9d194a..930aadb3d 100644 --- a/src/devices/wifi/interference-helper.cc +++ b/src/devices/wifi/interference-helper.cc @@ -369,6 +369,9 @@ InterferenceHelper::GetPayloadDurationMicroSeconds (uint32_t size, WifiMode payl case WIFI_PHY_STANDARD_80211_5Mhz: symbolDurationUs = 16; break; + case WIFI_PHY_STANDARD_80211b: + NS_FATAL_ERROR("can't happen here"); + symbolDurationUs = 0; // quiet compiler default: NS_FATAL_ERROR("unknown standard"); } From 890bd62643a9293aed74fe0118e7c246c6ca8800 Mon Sep 17 00:00:00 2001 From: Nicola Baldo Date: Thu, 16 Jul 2009 11:19:43 +0200 Subject: [PATCH 44/46] fixed g++-3.4 build --- src/devices/wifi/interference-helper.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/devices/wifi/interference-helper.cc b/src/devices/wifi/interference-helper.cc index 930aadb3d..f1d1ae1b4 100644 --- a/src/devices/wifi/interference-helper.cc +++ b/src/devices/wifi/interference-helper.cc @@ -381,7 +381,7 @@ InterferenceHelper::GetPayloadDurationMicroSeconds (uint32_t size, WifiMode payl double numDataBitsPerSymbol = payloadMode.GetDataRate () * symbolDurationUs / 1e6; // IEEE Std 802.11-2007, section 17.3.5.3, equation (17-11) - uint32_t numSymbols = ceil ((16 + size * 8.0 + 6.0)/numDataBitsPerSymbol); + uint32_t numSymbols = lrint (ceil ((16 + size * 8.0 + 6.0)/numDataBitsPerSymbol)); return numSymbols*symbolDurationUs; } @@ -390,7 +390,7 @@ InterferenceHelper::GetPayloadDurationMicroSeconds (uint32_t size, WifiMode payl NS_LOG_LOGIC(" size=" << size << " mode=" << payloadMode << " rate=" << payloadMode.GetDataRate () ); - return ceil ((size * 8.0) / (payloadMode.GetDataRate () / 1.0e6)); + return lrint(ceil ((size * 8.0) / (payloadMode.GetDataRate () / 1.0e6))); default: NS_FATAL_ERROR("unknown standard"); From a3cac79763f81d4cb286f282f02e40d062c334fc Mon Sep 17 00:00:00 2001 From: Kirill Andreev Date: Thu, 16 Jul 2009 13:51:12 +0400 Subject: [PATCH 45/46] Bug 625: Wrong calculation of GetAccessGrantStart in DcfManager. --- src/devices/wifi/dcf-manager-test.cc | 15 +++++++++++++++ src/devices/wifi/dcf-manager.cc | 2 +- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/src/devices/wifi/dcf-manager-test.cc b/src/devices/wifi/dcf-manager-test.cc index 968bbea5f..b94f0ed3f 100644 --- a/src/devices/wifi/dcf-manager-test.cc +++ b/src/devices/wifi/dcf-manager-test.cc @@ -379,6 +379,21 @@ DcfManagerTest::RunTests (void) AddAccessRequest (30, 2, 70, 0); ExpectCollision (30, 0, 0); // backoff: 0 slots EndTest (); + // Test shows when two frames are received without interval between + // them: + // 20 60 100 106 110 112 + // | rx | rx |sifs | aifsn | tx | + // | + // 30 request access. backoff slots: 0 + + StartTest (4, 6 , 10); + AddDcfState (1); + AddRxOkEvt (20, 40); + AddRxOkEvt (60, 40); + AddAccessRequest (30, 2, 110, 0); + ExpectCollision (30, 0, 0); // backoff: 0 slots + EndTest (); + // The test below is subject to some discussion because I am // not sure I understand the intent of the spec here. diff --git a/src/devices/wifi/dcf-manager.cc b/src/devices/wifi/dcf-manager.cc index ec2b0e1fc..320bf0621 100644 --- a/src/devices/wifi/dcf-manager.cc +++ b/src/devices/wifi/dcf-manager.cc @@ -433,7 +433,7 @@ Time DcfManager::GetAccessGrantStart (void) const { Time rxAccessStart; - if (m_lastRxEnd >= m_lastRxStart) + if (!m_rxing) { rxAccessStart = m_lastRxEnd; if (!m_lastRxReceivedOk) From cf7de38ffd6357eb933fdd8fc5775b9ac20519b4 Mon Sep 17 00:00:00 2001 From: Mathieu Lacage Date: Thu, 16 Jul 2009 12:31:26 +0200 Subject: [PATCH 46/46] bug 381: Wifi crashes on shutdown --- src/devices/wifi/nqap-wifi-mac.cc | 1 + src/devices/wifi/nqsta-wifi-mac.cc | 1 + src/devices/wifi/qap-wifi-mac.cc | 5 +++-- src/devices/wifi/qsta-wifi-mac.cc | 1 + 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/devices/wifi/nqap-wifi-mac.cc b/src/devices/wifi/nqap-wifi-mac.cc index f72b865b5..4b9c8ce0b 100644 --- a/src/devices/wifi/nqap-wifi-mac.cc +++ b/src/devices/wifi/nqap-wifi-mac.cc @@ -97,6 +97,7 @@ NqapWifiMac::DoDispose (void) NS_LOG_FUNCTION (this); delete m_rxMiddle; delete m_dcfManager; + m_low->Dispose (); m_rxMiddle = 0; m_low = 0; m_dcfManager = 0; diff --git a/src/devices/wifi/nqsta-wifi-mac.cc b/src/devices/wifi/nqsta-wifi-mac.cc index 4a979500b..e7bceba8f 100644 --- a/src/devices/wifi/nqsta-wifi-mac.cc +++ b/src/devices/wifi/nqsta-wifi-mac.cc @@ -128,6 +128,7 @@ NqstaWifiMac::DoDispose (void) NS_LOG_FUNCTION (this); delete m_rxMiddle; delete m_dcfManager; + m_low->Dispose (); m_rxMiddle = 0; m_low = 0; m_dcfManager = 0; diff --git a/src/devices/wifi/qap-wifi-mac.cc b/src/devices/wifi/qap-wifi-mac.cc index 066bf0187..af9bb6938 100644 --- a/src/devices/wifi/qap-wifi-mac.cc +++ b/src/devices/wifi/qap-wifi-mac.cc @@ -119,10 +119,11 @@ void QapWifiMac::DoDispose () { delete m_rxMiddle; - m_rxMiddle = 0; delete m_txMiddle; - m_txMiddle = 0; delete m_dcfManager; + m_low->Dispose (); + m_rxMiddle = 0; + m_txMiddle = 0; m_dcfManager = 0; m_low = 0; m_phy = 0; diff --git a/src/devices/wifi/qsta-wifi-mac.cc b/src/devices/wifi/qsta-wifi-mac.cc index cdb12ba27..e3c3fed5a 100644 --- a/src/devices/wifi/qsta-wifi-mac.cc +++ b/src/devices/wifi/qsta-wifi-mac.cc @@ -125,6 +125,7 @@ QstaWifiMac::DoDispose () delete m_rxMiddle; delete m_txMiddle; delete m_dcfManager; + m_low->Dispose (); m_rxMiddle = 0; m_txMiddle = 0; m_low = 0;