branch merge
authorCraig Dowell <craigdo@ee.washington.edu>
Tue Aug 26 23:16:31 2008 -0700 (17 months ago)
changeset 3581385bdac52fd3
parent 3580 e388935fa948
parent 3578 6c3efec9cbe6
child 3582 775d9648a294
branch merge
     1.1 --- a/bindings/python/wscript	Tue Aug 26 23:11:11 2008 -0700
     1.2 +++ b/bindings/python/wscript	Tue Aug 26 23:16:31 2008 -0700
     1.3 @@ -21,7 +21,7 @@
     1.4      os.environ['PYTHONPATH'] = LOCAL_PYBINDGEN_PATH
     1.5  
     1.6  ## https://launchpad.net/pybindgen/
     1.7 -REQUIRED_PYBINDGEN_VERSION = (0, 9, 0, 563)
     1.8 +REQUIRED_PYBINDGEN_VERSION = (0, 9, 0, 564)
     1.9  REQUIRED_PYGCCXML_VERSION = (0, 9, 5)
    1.10  
    1.11  
     2.1 --- a/src/helper/on-off-helper.h	Tue Aug 26 23:11:11 2008 -0700
     2.2 +++ b/src/helper/on-off-helper.h	Tue Aug 26 23:16:31 2008 -0700
     2.3 @@ -31,13 +31,34 @@
     2.4  
     2.5  namespace ns3 {
     2.6  
     2.7 +/**
     2.8 + * \brief instanciate an ns3::OnOffApplication on a set of nodes.
     2.9 + */
    2.10  class OnOffHelper
    2.11  {
    2.12  public:
    2.13 +  /**
    2.14 +   * \param protocol the name of the protocol to use to send traffic
    2.15 +   *        by the applications. This string identifies the socket
    2.16 +   *        factory type used to create sockets for the applications.
    2.17 +   *        A typical value would be ns3::UdpSocketFactory.
    2.18 +   * \param address the address of the remote node to send traffic
    2.19 +   *        to.
    2.20 +   */
    2.21    OnOffHelper (std::string protocol, Address address);
    2.22  
    2.23 +  /**
    2.24 +   * \param name the name of the application attribute to set
    2.25 +   * \param value the value of the application attribute to set
    2.26 +   */
    2.27    void SetAttribute (std::string name, const AttributeValue &value);
    2.28  
    2.29 +  /**
    2.30 +   * \param c the set of nodes on which an OnOffApplication will be installed.
    2.31 +   *
    2.32 +   * Install an ns3::OnOffApplication on each node of the input container
    2.33 +   * configured with all the attributes set with SetAttribute.
    2.34 +   */
    2.35    ApplicationContainer Install (NodeContainer c);
    2.36  
    2.37  private: