Attachment #317 for bug #215

View | Details | Raw Unified | Return to bug 215
Collapse All | Expand All

(-)a/examples/csma-star.cc (-3 / +3 lines)

Lines 23-39	Link Here

// Network topology (default)

// Network topology (default)

//

//

//            n2     +          +     n3          .

//            n3     +          +     n2          .

//             | ... |\        /| ... |           .

//             | ... |\        /| ... |           .

//             ======= \      / =======           .

//             ======= \      / =======           .

//              CSMA    \    /   CSMA             .

//              CSMA    \    /   CSMA             .

//                       \  /                     .

//                       \  /                     .

//            n1     +--- n0 ---+     n4          .

//            n4     +--- n0 ---+     n1          .

//             | ... |   /  \   | ... |           .

//             | ... |   /  \   | ... |           .

//             =======  /    \  =======           .

//             =======  /    \  =======           .

//              CSMA   /      \  CSMA             .

//              CSMA   /      \  CSMA             .

//                    /        \                  .

//                    /        \                  .

//            n6     +          +     n5          .

//            n5     +          +     n6          .

//             | ... |          | ... |           .

//             | ... |          | ... |           .

//             =======          =======           .

//             =======          =======           .

//              CSMA             CSMA             .

//              CSMA             CSMA             .

(-)a/src/core/wscript (+2 lines)

Lines 73-78 def build(bld):	Link Here

        'trace-source-accessor.cc',

        'trace-source-accessor.cc',

        'config.cc',

        'config.cc',

        'callback.cc',

        'callback.cc',

        'name-list.cc',

    core.uselib = 'RT'

    core.uselib = 'RT'

Lines 118-123 def build(bld):	Link Here

118

        'object-vector.h',

119

        'object-vector.h',

119

        'deprecated.h',

120

        'deprecated.h',

120

        'abort.h',

121

        'abort.h',

122

        'name-list.h',

121

123

122

124

123

    if sys.platform == 'win32':

125

    if sys.platform == 'win32':

(-)a/src/devices/wifi/dca-txop.cc (-5 / +9 lines)

Lines 475-480 DcaTxop::MissedCts (void)	Link Here

475

      MY_DEBUG ("Cts Fail");

475

      MY_DEBUG ("Cts Fail");

476

      WifiRemoteStation *station = GetStation (m_currentHdr.GetAddr1 ());

476

      WifiRemoteStation *station = GetStation (m_currentHdr.GetAddr1 ());

477

      station->ReportFinalRtsFailed ();

477

      station->ReportFinalRtsFailed ();

478

      if (!m_txFailedCallback.IsNull ())

479

480

          m_txFailedCallback (m_currentHdr);

481

478

      // to reset the dcf.

482

      // to reset the dcf.

479

      m_currentPacket = 0;

483

      m_currentPacket = 0;

480

      m_dcf->ResetCw ();

484

      m_dcf->ResetCw ();

Lines 522-528 DcaTxop::MissedAck (void)	Link Here

522

      MY_DEBUG ("Ack Fail");

526

      MY_DEBUG ("Ack Fail");

523

      WifiRemoteStation *station = GetStation (m_currentHdr.GetAddr1 ());

527

      WifiRemoteStation *station = GetStation (m_currentHdr.GetAddr1 ());

524

      station->ReportFinalDataFailed ();

528

      station->ReportFinalDataFailed ();

525

      // to reset the dcf.

529

      if (!m_txFailedCallback.IsNull ())

530

531

          m_txFailedCallback (m_currentHdr);

532

533

      // to reset the dcf.

526

      m_currentPacket = 0;

534

      m_currentPacket = 0;

527

      m_dcf->ResetCw ();

535

      m_dcf->ResetCw ();

528

536

Lines 530-539 DcaTxop::MissedAck (void)	Link Here

530

538

531

      MY_DEBUG ("Retransmit");

539

      MY_DEBUG ("Retransmit");

532

      m_currentHdr.SetRetry ();

540

      m_currentHdr.SetRetry ();

533

      if (!m_txFailedCallback.IsNull ())

534

535

          m_txFailedCallback (m_currentHdr);

536

537

      m_dcf->UpdateFailedCw ();

541

      m_dcf->UpdateFailedCw ();

538

542

539

  m_dcf->StartBackoffNow (m_rng->GetNext (0, m_dcf->GetCw ()));

543

  m_dcf->StartBackoffNow (m_rng->GetNext (0, m_dcf->GetCw ()));




/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */
/*
 * Copyright (c) 2008 University of Washington
 *
 * 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
 */

#include "ns3/object.h"
#include "ns3/log.h"
#include "ns3/assert.h"
#include "ns3/abort.h"
#include "ns3/simulator.h"
#include "name-list.h"

namespace ns3 {

NS_LOG_COMPONENT_DEFINE ("NameList");

/**
 * \brief private implementation detail of the NameList API.
 */
class NameListPriv 
{
public:
  NameListPriv ();
  ~NameListPriv ();

  bool Add (Ptr<Object> obj, std::string name);
  Ptr<Object> GetObjectOfName (std::string name);

  static NameListPriv *Get (void);
  
private:
  static NameListPriv **DoGet (void);

  static void Delete (void);
  std::vector<std::pair<Ptr<Object>, std::string> > m_names;
};

NameListPriv *
NameListPriv::Get (void)
{
  return *(DoGet ());
}

NameListPriv **
NameListPriv::DoGet (void)
{
  NS_LOG_FUNCTION_NOARGS ();

  //
  // ptr is declared as a function-local static variable.  This variable is 
  // guaranteed to be initialized to zero (by code generated by the compiler)
  // the first time the function is called.  Afterward it acts like a global
  // variable whose scope is defined by the function.
  //
  static NameListPriv *ptr = 0;

  //
  // We "piggyback" on the guaranteed initialization of ptr to zero and do
  // essentially the same thing the compiler did there in order to create
  // the private object one time.  This is a simple way to implement a 
  // singleton (a simpleton?).
  //
  if (ptr == 0)
    {
      ptr = new NameListPriv;
      Simulator::ScheduleDestroy (&NameListPriv::Delete);
    }
  //
  // Returns a pointer to the pointer to the name list implementation object.
  // Why?  See NameListPriv::Delete
  //
  return &ptr;
}

void 
NameListPriv::Delete (void)
{
  NS_LOG_FUNCTION_NOARGS ();

  //
  // DoGet returns a pointer to a pointer to the private implementation.  We
  // need to call the destructor on the pointer, and also set the pointer 
  // itself to zero to complete the teardown.
  //
  NameListPriv **ptr = DoGet ();
  // 
  // This is a sneaky, behind the sheets way to get the object pointed to by the 
  // function local variable ptr, with scope up in DoGet, torn down and the 
  // pointer set to zero.
  //
  delete *ptr;
  *ptr = 0;
}

NameListPriv::NameListPriv ()
{
  NS_LOG_FUNCTION_NOARGS ();
}

NameListPriv::~NameListPriv ()
{
  NS_LOG_FUNCTION_NOARGS ();
  
  //
  // Clean up the list of names we have stored.  This function is expected to be
  // called during Simulator::Destroy
  //
  for (std::vector<std::pair<Ptr<Object>, std::string> >::iterator i = m_names.begin (); i != m_names.end (); ++i)
    {
      //
      // We just decrement the reference count here.  We leave it to others,
      // for example the node list, to call dispose.
      //
      Ptr<Object> object = i->first;
      i->first = 0;
    }
  //
  // get rid of all of the <object, name> pairs in the underlying vector.
  //
  m_names.erase (m_names.begin (), m_names.end ());
}

bool
NameListPriv::Add (Ptr<Object> object, std::string name)
{
  //
  // We demand that all objects have a unique name in this particular namespace.
  // If the proposed name is unique, we add it to the collection and return true.
  // If there is an existing name in the collection, then we refuse to add it 
  // and return false.  
  //
  if (GetObjectOfName (name) == 0)
    {
      m_names.push_back (std::make_pair (object, name));
      return true;
    }
  else
    {
      return false;
    }
}

Ptr<Object>
NameListPriv::GetObjectOfName (std::string name)
{
  NS_LOG_FUNCTION (name);

  // 
  // Just do a simple, old-fashioned, linear search through the name/object mappings
  // for a name match.  If we find an object of the given name, return its Ptr.  The
  // inability to find an object/name pair is reflected by returning a zero Ptr.
  //
  for (std::vector<std::pair<Ptr<Object>, std::string> >::iterator i = m_names.begin (); i != m_names.end (); ++i)
    {
      if (i->second == name)
        {
          return i->first;
        }
    }
  return 0;
}

}

namespace ns3 {

bool
NameList::Add (Ptr<Object> object, std::string name)
{
  return NameListPriv::Get ()->Add (object, name);
}

Ptr<Object>
NameList::GetObjectOfNameInternal (std::string name)
{
  return NameListPriv::Get ()->GetObjectOfName (name);
}

}//namespace ns3

#ifdef RUN_SELF_TESTS

#include "test.h"
#include "object-factory.h"

namespace {

class TestObject : public ns3::Object
{
public:
  static ns3::TypeId GetTypeId (void) 
  {
    static ns3::TypeId tid = ns3::TypeId ("TestObject")
      .SetParent (Object::GetTypeId ())
      .HideFromDocumentation ()
      .AddConstructor<TestObject> ();
    return tid;
  }
  TestObject () {}
  virtual void Dispose (void) {}
};

class FakeTestObject : public ns3::Object
{
public:
  static ns3::TypeId GetTypeId (void) 
  {
    static ns3::TypeId tid = ns3::TypeId ("FaleTestObject")
      .SetParent (Object::GetTypeId ())
      .HideFromDocumentation ()
      .AddConstructor<TestObject> ();
    return tid;
  }
  FakeTestObject () {}
  virtual void Dispose (void) {}
};

} // namespace anonymous

namespace ns3 {

class NameListTest : public Test
{
public:
  NameListTest ();
  virtual bool RunTests (void);
};

NameListTest::NameListTest ()
  : Test ("NameList")
{
}

bool 
NameListTest::RunTests (void)
{
  bool result = true;

  std::string name1 = "Test Object 1";
  Ptr<TestObject> obj1 = CreateObject<TestObject> ();

  result = NameList::Add (obj1, name1);
  NS_TEST_ASSERT_EQUAL (result, true);

  result = NameList::Add (obj1, name1);
  NS_TEST_ASSERT_EQUAL (result, false);

  std::string name2 = "Test Object 2";
  Ptr<TestObject> obj2 = CreateObject<TestObject> ();

  result = NameList::Add (obj2, name2);
  NS_TEST_ASSERT_EQUAL (result, true);

  Ptr<TestObject> obj = NameList::GetObjectOfName<TestObject> (name1);
  NS_TEST_ASSERT_EQUAL (obj, obj1);

  Ptr<FakeTestObject> fobj = NameList::GetObjectOfName<FakeTestObject> (name1);
  NS_TEST_ASSERT_EQUAL (fobj, 0);

  obj = NameList::GetObjectOfName<TestObject> (name2);
  NS_TEST_ASSERT_EQUAL (obj, obj2);

  obj = NameList::GetObjectOfName<TestObject> ("yadda");
  NS_TEST_ASSERT_EQUAL (obj, 0);

  //
  // Run the simulator and destroy it to get the Destroy method called on the
  // private implementation object.  We don't hack in a way here to get access
  // to the raw pointer and assert that it is zeroed since taht really doesn't
  // tell us that the memory allcated during the tests has successfully been 
  // released.  Instead we depend on seeing a valgrind-clean run of the unit 
  // tests to really determine if the clean up was successful.
  //
  Simulator::Run ();
  Simulator::Destroy ();
  
  return result;
}

static NameListTest g_nameListTests;

} // namespace ns3

#endif /* RUN_SELF_TESTS */




/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */
/*
 * Copyright (c) 2008 University of Washington
 *
 * 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
 */

#ifndef NAME_LIST_H
#define NAME_LIST_H

#include <vector>
#include "ns3/ptr.h"
#include "ns3/object.h"

namespace ns3 {

/**
 * \brief A container of name and Ptr<Object> associations that allows us to
 * give any ns3 Object a name.  This is a flat namespace and we require all
 * names to be unique.
 */
class NameList
{
public:
  /**
   * \brief Add an object to name association to the global name list.  The
   * provided name string must be unique in the flat object name space.
   *
   * \param object Ptr<Object> to the object we want to associate a name with.
   * \param name String containing the name of the object.
   * \returns True if the <object, name> pair is successfully added or false
   * if the name already exists in the namespace.
   */
  static bool Add (Ptr<Object> object, std::string name);

  /**
   * \brief Retrieve an object of a given name from the global name list.
   *
   * \param name String containing the name of the object.
   * \returns Ptr to the object associated with the parameter name if one 
   * exists otherwise the null Ptr.
   */
  template <typename T>
  static Ptr<T> GetObjectOfName (std::string name);

private:
  static Ptr<Object> GetObjectOfNameInternal (std::string name);

};

template <typename T>
Ptr<T> 
NameList::GetObjectOfName (std::string name)
{
  Ptr<Object> obj = NameList::GetObjectOfNameInternal (name);
  if (obj)
    {
      return obj->GetObject<T> ();
    }
  else
    {
      return 0;
    }
}


}//namespace ns3

#endif /* NAME_LIST_H */




 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */

#include <vector>
#include "ns3/object.h"
#include "ns3/log.h"
#include "ns3/assert.h"

namespace ns3 {

NS_LOG_COMPONENT_DEFINE ("NameList");

class NameListNode
{
public:
  NameListNode () {}
  ~NameListNode () {m_children.clear ();}

  uint32_t GetNChildren () {return m_children.size ();}
  NameListNode *GetChild (uint32_t n) {return m_children[n];}
  void AddChild (NameListNode *child) {m_children.push_back (child);}
  void SetName (std::string name) {m_name = name;}
private:
  std::vector<NameListNode *> m_children;
  std::string m_name;
};

/**
 * \brief private implementation detail of the NameList API.


  bool Add (Ptr<Object> obj, std::string name);
  Ptr<Object> GetObjectOfName (std::string name);
  std::string GetNameOfObject (Ptr<Object> object);

  static NameListPriv *Get (void);
  

NameListPriv::Add (Ptr<Object> object, std::string name)
{
  //
  // This class operates sort of like a bidirectional map, so we demand that all
  // objects and names are unique..
  // If there is an existing name in the collection, then we refuse to add it 
  // and return false.  
  //
  if (GetObjectOfName (name) == 0 && GetNameOfObject (object).empty ())
    {
      m_names.push_back (std::make_pair (object, name));
      return true;

  return 0;
}

std::string
NameListPriv::GetNameOfObject (Ptr<Object> object)
{
  NS_LOG_FUNCTION (object);

  // 
  // Just do a simple, old-fashioned, linear search through the name/object mappings
  // for an object match.  If we find an object of the given name, return its name.  The
  // inability to find an object/name pair is reflected by returning an empty string.
  //
  for (std::vector<std::pair<Ptr<Object>, std::string> >::iterator i = m_names.begin (); i != m_names.end (); ++i)
    {
      if (i->first == object)
        {
          return i->second;
        }
    }
  return std::string ();
}

namespace ns3 {

bool
NameList::Add (Ptr<Object> object, std::string name)

NameList::GetObjectOfNameInternal (std::string name)
{
  return NameListPriv::Get ()->GetObjectOfName (name);
}

std::string
NameList::GetNameOfObject (Ptr<Object> object)
{
  return NameListPriv::Get ()->GetNameOfObject (object);
}

}//namespace ns3

  std::string name1 = "Test Object 1";
  Ptr<TestObject> obj1 = CreateObject<TestObject> ();

  // 
  // Put an <object, name> pair into the name list
  //
  result = NameList::Add (obj1, name1);
  NS_TEST_ASSERT_EQUAL (result, true);

  //
  // We shouldn't be able to put another pair into the list with either the same
  // name or same object in it.
  //
  Ptr<TestObject> someOtherObject = CreateObject<TestObject> ();

  result = NameList::Add (someOtherObject, name1);
  NS_TEST_ASSERT_EQUAL (result, false);

  result = NameList::Add (obj1, "Some other name");
  NS_TEST_ASSERT_EQUAL (result, false);

  std::string name2 = "Test Object 2";

  Ptr<TestObject> obj = NameList::GetObjectOfName<TestObject> (name1);
  NS_TEST_ASSERT_EQUAL (obj, obj1);

  std::string name = NameList::GetNameOfObject (obj);
  NS_TEST_ASSERT_EQUAL (name, name1);

  Ptr<FakeTestObject> fobj = NameList::GetObjectOfName<FakeTestObject> (name1);
  NS_TEST_ASSERT_EQUAL (fobj, 0);

  obj = NameList::GetObjectOfName<TestObject> (name2);
  NS_TEST_ASSERT_EQUAL (obj, obj2);

  name = NameList::GetNameOfObject (obj);
  NS_TEST_ASSERT_EQUAL (name, name2);

  obj = NameList::GetObjectOfName<TestObject> ("yadda");
  NS_TEST_ASSERT_EQUAL (obj, 0);

  Ptr<TestObject> objx = CreateObject<TestObject> ();
  name = NameList::GetNameOfObject (obj);
  NS_TEST_ASSERT_EQUAL (name.empty (), true);

  //
  // Run the simulator and destroy it to get the Destroy method called on the

(-)a/src/core/name-list.h (+2 lines)

Lines 54-59 public:	Link Here

  template <typename T>

  template <typename T>

  static Ptr<T> GetObjectOfName (std::string name);

  static Ptr<T> GetObjectOfName (std::string name);

  static std::string GetNameOfObject (Ptr<Object> object);

private:

private:

  static Ptr<Object> GetObjectOfNameInternal (std::string name);

  static Ptr<Object> GetObjectOfNameInternal (std::string name);

(-)a/examples/csma-one-subnet.cc (-6 / +32 lines)

Lines 64-69 main (int argc, char *argv[])	Link Here

  NodeContainer nodes;

  NodeContainer nodes;

  nodes.Create (4);

  nodes.Create (4);

//

// Associate human readable names with some of the nodes so we can refer to them

// easily.

//

  NameList::Add (nodes.Get (0), "Node 0");

  NameList::Add (nodes.Get (1), "Node 1");

  NameList::Add (nodes.Get (3), "Node 3");

  NS_LOG_INFO ("Build Topology");

  NS_LOG_INFO ("Build Topology");

  CsmaHelper csma;

  CsmaHelper csma;

  csma.SetChannelAttribute ("DataRate", DataRateValue (5000000));

  csma.SetChannelAttribute ("DataRate", DataRateValue (5000000));

Lines 74-82 main (int argc, char *argv[])	Link Here

//

//

  NetDeviceContainer devices = csma.Install (nodes);

  NetDeviceContainer devices = csma.Install (nodes);

//

// Associate human readable names with some of the devices so we can refer to them

// easily.  Recall that the CsmaHelper will return a container arranged so the zeroth

// device in the returned container corresponds to the zeroth node in the node

// container passed as a parameter.

//

  NameList::Add (devices.Get (0), "Node 0/eth0");

  NameList::Add (devices.Get (1), "Node 1/eth0");

  NameList::Add (devices.Get (3), "Node 3/eth0");

  InternetStackHelper internet;

  InternetStackHelper internet;

  internet.Install (nodes);

  internet.Install (nodes);

//

// We've got the "hardware" in place.  Now we need to add IP addresses.

// We've got the "hardware" in place.  Now we need to add IP addresses.

//

100

//

  NS_LOG_INFO ("Assign IP Addresses.");

101

  NS_LOG_INFO ("Assign IP Addresses.");

Lines 85-91 main (int argc, char *argv[])	Link Here

  Ipv4InterfaceContainer interfaces = ipv4.Assign (devices);

104

  Ipv4InterfaceContainer interfaces = ipv4.Assign (devices);

105

//

106

//

// Create an OnOff application to send UDP datagrams from node zero to node 1.

107

// Associate human readable names with some of the Ipv4 Interfaces so we can

108

// refer to them easily.

109

//

110

  NameList::Add (interfaces.GetInterface (0), "Node 0/ipv4");

111

  NameList::Add (interfaces.GetInterface (1), "Node 1/ipv4");

112

113

//

114

// Create an OnOff application to send UDP datagrams from "Node 0" to "Node 1".

//

115

//

  NS_LOG_INFO ("Create Applications.");

116

  NS_LOG_INFO ("Create Applications.");

  uint16_t port = 9;   // Discard port (RFC 863)

117

  uint16_t port = 9;   // Discard port (RFC 863)

Lines 95-101 main (int argc, char *argv[])	Link Here

  onoff.SetAttribute ("OnTime", RandomVariableValue (ConstantVariable (1)));

121

  onoff.SetAttribute ("OnTime", RandomVariableValue (ConstantVariable (1)));

  onoff.SetAttribute ("OffTime", RandomVariableValue (ConstantVariable (0)));

122

  onoff.SetAttribute ("OffTime", RandomVariableValue (ConstantVariable (0)));

123

  ApplicationContainer app = onoff.Install (nodes.Get (0));

124

  ApplicationContainer app = onoff.Install (NameList::GetObjectOfName<Node> ("Node 0"));

  // Start the application

125

  // Start the application

100

  app.Start (Seconds (1.0));

126

  app.Start (Seconds (1.0));

101

  app.Stop (Seconds (10.0));

127

  app.Stop (Seconds (10.0));

Lines 103-121 main (int argc, char *argv[])	Link Here

103

  // Create an optional packet sink to receive these packets

129

  // Create an optional packet sink to receive these packets

104

  PacketSinkHelper sink ("ns3::UdpSocketFactory",

130

  PacketSinkHelper sink ("ns3::UdpSocketFactory",

105

    Address (InetSocketAddress (Ipv4Address::GetAny (), port)));

131

    Address (InetSocketAddress (Ipv4Address::GetAny (), port)));

106

  app = sink.Install (nodes.Get (1));

132

  app = sink.Install (NameList::GetObjectOfName<Node> ("Node 1"));

107

  app.Start (Seconds (0.0));

133

  app.Start (Seconds (0.0));

108

134

109

//

135

//

110

// Create a similar flow from n3 to n0, starting at time 1.1 seconds

136

// Create a similar flow from "Node 3" to "Node 0", starting at time 1.1 seconds

111

//

137

//

112

  onoff.SetAttribute ("Remote",

138

  onoff.SetAttribute ("Remote",

113

                      AddressValue (InetSocketAddress (interfaces.GetAddress (0), port)));

139

                      AddressValue (InetSocketAddress (interfaces.GetAddress (0), port)));

114

  app = onoff.Install (nodes.Get (3));

140

  app = onoff.Install (NameList::GetObjectOfName<Node> ("Node 3"));

115

  app.Start(Seconds (1.1));

141

  app.Start(Seconds (1.1));

116

  app.Stop (Seconds (10.0));

142

  app.Stop (Seconds (10.0));

117

143

118

  app = sink.Install (nodes.Get (0));

144

  app = sink.Install (NameList::GetObjectOfName<Node> ("Node 0"));

119

  app.Start (Seconds (0.0));

145

  app.Start (Seconds (0.0));

120

146

121

//

147

//

(-)a/src/helper/ipv4-interface-container.cc (+7 lines)

Lines 28-33 Ipv4InterfaceContainer::GetAddress (uint	Link Here

  uint32_t interface = m_interfaces[i].second;

  uint32_t interface = m_interfaces[i].second;

  return ipv4->GetAddress (interface);

  return ipv4->GetAddress (interface);

Ptr<Ipv4>

Ipv4InterfaceContainer::GetInterface (uint32_t i) const

  return m_interfaces[i].first;

void

void

Ipv4InterfaceContainer::SetMetric (uint32_t i, uint16_t metric)

Ipv4InterfaceContainer::SetMetric (uint32_t i, uint16_t metric)

(-)a/src/helper/ipv4-interface-container.h (+3 lines)

Lines 31-36 public:	Link Here

  uint32_t GetN (void) const;

  uint32_t GetN (void) const;

  Ipv4Address GetAddress (uint32_t i) const;

  Ipv4Address GetAddress (uint32_t i) const;

  Ptr<Ipv4> GetInterface (uint32_t i) const;

  void SetMetric (uint32_t i, uint16_t metric);

  void SetMetric (uint32_t i, uint16_t metric);

  void Add (Ptr<Ipv4> ipv4, uint32_t interface);

  void Add (Ptr<Ipv4> ipv4, uint32_t interface);




#if 0 
  LogComponentEnable ("CsmaOneSubnetExample", LOG_LEVEL_INFO);
#endif

//
// Make the random number generators generate reproducible results.
//
  RandomVariable::UseGlobalSeed (1, 1, 2, 3, 5, 8);

//
// Allow the user to override any of the defaults and the above Bind() at
// run-time, via command-line arguments
//
  CommandLine cmd;
  cmd.Parse (argc, argv);

//
// Explicitly create the nodes required by the topology (shown above).
//

  CsmaHelper csma;
  csma.SetChannelAttribute ("DataRate", DataRateValue (5000000));
  csma.SetChannelAttribute ("Delay", TimeValue (MilliSeconds (2)));

//
// Now fill out the topology by creating the net devices required to connect
// the nodes to the channels and hooking them up.

// and can be read by the "tcpdump -r" command (use "-tt" option to
// display timestamps correctly)
//
  CsmaHelper::EnablePcap ("csma-one-subnet", "Node 0/eth0");
  CsmaHelper::EnablePcap ("csma-one-subnet", "Node 1/eth0");
  CsmaHelper::EnablePcap ("csma-one-subnet", "Node 3/eth0");
//
// Now, do the actual simulation.
//




#include "ns3/csma-channel.h"
#include "ns3/pcap-writer.h"
#include "ns3/config.h"
#include "ns3/name-list.h"
#include "ns3/packet.h"
#include "ns3/abort.h"
#include <string>

namespace ns3 {

  oss << "/NodeList/" << nodeid << "/DeviceList/" << deviceid << "/$ns3::CsmaNetDevice/TxQueue/Enqueue";
  Config::ConnectWithoutContext (oss.str (), MakeBoundCallback (&CsmaHelper::EnqueueEvent, pcap));
}

void
CsmaHelper::EnablePcap (std::string filename, std::string devname)
{
  Ptr<CsmaNetDevice> device = NameList::GetObjectOfName<CsmaNetDevice> (devname);
  NS_ABORT_MSG_UNLESS (device, "CsmaHelper::EnablePcap(): Device name not found");
  EnablePcap (filename, device->GetNode ()->GetId (), device->GetIfIndex ());
}

void 
CsmaHelper::EnablePcap (std::string filename, NetDeviceContainer d)
{

(-)a/src/helper/csma-helper.h (+7 lines)

Lines 96-101 public:	Link Here

   * been fully constructed.

   * been fully constructed.

*/

*/

  static void EnablePcap (std::string filename, uint32_t nodeid, uint32_t deviceid);

  static void EnablePcap (std::string filename, uint32_t nodeid, uint32_t deviceid);

/**

100

   * \param filename filename prefix to use for pcap files.

101

   * \param devname the name of a device stored in the NameList.

102

103

   * Enable pcap output on the device specified by name

104

*/

105

  static void EnablePcap (std::string filename, std::string devname);

/**

106

/**

100

   * \param filename filename prefix to use for pcap files.

107

   * \param filename filename prefix to use for pcap files.

101

   * \param d container of devices of type ns3::CsmaNetDevice

108

   * \param d container of devices of type ns3::CsmaNetDevice




#include "ns3/emu-net-device.h"
#include "ns3/pcap-writer.h"
#include "ns3/config.h"
#include "ns3/name-list.h"
#include "ns3/packet.h"
#include "ns3/abort.h"
#include "emu-helper.h"

NS_LOG_COMPONENT_DEFINE ("EmuHelper");

    "/$ns3::EmuNetDevice/TxQueue/Enqueue";
  Config::ConnectWithoutContext (oss.str (), 
    MakeBoundCallback (&EmuHelper::EnqueueEvent, pcap));
}

void
EmuHelper::EnablePcap (std::string filename, std::string devname)
{
  Ptr<EmuNetDevice> device = NameList::GetObjectOfName<EmuNetDevice> (devname);
  NS_ABORT_MSG_UNLESS (device, "EmuHelper::EnablePcap(): Device name not found");
  EnablePcap (filename, device->GetNode ()->GetId (), device->GetIfIndex ());
}

  void 

(-)a/src/helper/emu-helper.h (-2 / +9 lines)

Lines 81-88 public:	Link Here

   * This method should be invoked after the network topology has

   * This method should be invoked after the network topology has

   * been fully constructed.

   * been fully constructed.

*/

*/

  static void EnablePcap (std::string filename, uint32_t nodeid,

  static void EnablePcap (std::string filename, uint32_t nodeid, uint32_t deviceid);

    uint32_t deviceid);

/**

   * \param filename filename prefix to use for pcap files.

   * \param devname name of device

   * Enable pcap output on the named device.

*/

  static void EnablePcap (std::string filename, std::string devname);

/**

/**

   * \param filename filename prefix to use for pcap files.

   * \param filename filename prefix to use for pcap files.




#include "ns3/pcap-writer.h"
#include "ns3/config.h"
#include "ns3/packet.h"
#include "ns3/name-list.h"
#include "ns3/abort.h"

namespace ns3 {


PointToPointHelper::PointToPointHelper ()
{

  oss << "/NodeList/" << nodeid << "/DeviceList/" << deviceid << "/$ns3::PointToPointNetDevice/TxQueue/Enqueue";
  Config::ConnectWithoutContext (oss.str (), MakeBoundCallback (&PointToPointHelper::EnqueueEvent, pcap));
}

void
PointToPointHelper::EnablePcap (std::string filename, std::string devname)
{
  Ptr<PointToPointNetDevice> device = NameList::GetObjectOfName<PointToPointNetDevice> (devname);
  NS_ABORT_MSG_UNLESS (device, "PointToPointHelper::EnablePcap(): Device name not found");
  EnablePcap (filename, device->GetNode ()->GetId (), device->GetIfIndex ());
}

void 
PointToPointHelper::EnablePcap (std::string filename, NetDeviceContainer d)
{

(-)a/src/helper/point-to-point-helper.h (+9 lines)

Lines 95-100 public:	Link Here

   * been fully constructed.

   * been fully constructed.

*/

*/

  static void EnablePcap (std::string filename, uint32_t nodeid, uint32_t deviceid);

  static void EnablePcap (std::string filename, uint32_t nodeid, uint32_t deviceid);

/**

100

   * \param filename filename prefix to use for pcap files.

101

   * \param devname name of device

102

103

   * Enable pcap output on the named device.

104

*/

105

  static void EnablePcap (std::string filename, std::string devname);

106

/**

107

/**

   * \param filename filename prefix to use for pcap files.

108

   * \param filename filename prefix to use for pcap files.

100

   * \param d container of devices of type ns3::PointToPointNetDevice

109

   * \param d container of devices of type ns3::PointToPointNetDevice

(-)a/src/helper/yans-wifi-phy-helper.cc (+11 lines)

Lines 26-31	Link Here

#include "ns3/wifi-net-device.h"

#include "ns3/wifi-net-device.h"

#include "ns3/pcap-writer.h"

#include "ns3/pcap-writer.h"

#include "ns3/simulator.h"

#include "ns3/simulator.h"

#include "ns3/name-list.h"

#include "ns3/abort.h"

#include "ns3/config.h"

#include "ns3/config.h"

namespace ns3 {

namespace ns3 {

Lines 229-234 YansWifiPhyHelper::EnablePcap (std::stri	Link Here

229

  oss << "/NodeList/" << nodeid << "/DeviceList/" << deviceid << "/$ns3::WifiNetDevice/Phy/State/RxOk";

231

  oss << "/NodeList/" << nodeid << "/DeviceList/" << deviceid << "/$ns3::WifiNetDevice/Phy/State/RxOk";

230

  Config::ConnectWithoutContext (oss.str (), MakeBoundCallback (&PcapPhyRxEvent, pcap));

232

  Config::ConnectWithoutContext (oss.str (), MakeBoundCallback (&PcapPhyRxEvent, pcap));

231

233

234

235

void

236

YansWifiPhyHelper::EnablePcap (std::string filename, std::string devname)

237

238

  Ptr<NetDevice> device = NameList::GetObjectOfName<NetDevice> (devname);

239

  NS_ABORT_MSG_UNLESS (device, "YansWifiPhyHelper::EnablePcap(): Device name not found");

240

  EnablePcap (filename, device->GetNode ()->GetId (), device->GetIfIndex ());

241

242

232

void

243

void

233

YansWifiPhyHelper::EnablePcap (std::string filename, NetDeviceContainer d)

244

YansWifiPhyHelper::EnablePcap (std::string filename, NetDeviceContainer d)

234

245

(-)a/src/helper/yans-wifi-phy-helper.h (+9 lines)

Lines 92-97 public:	Link Here

   * been fully constructed.

   * been fully constructed.

*/

*/

  static void EnablePcap (std::string filename, uint32_t nodeid, uint32_t deviceid);

  static void EnablePcap (std::string filename, uint32_t nodeid, uint32_t deviceid);

/**

   * \param filename filename prefix to use for pcap files.

   * \param devname name of device

100

   * Enable pcap output on the named device.

101

*/

102

  static void EnablePcap (std::string filename, std::string devname);

103

/**

104

/**

   * \param filename filename prefix to use for pcap files.

105

   * \param filename filename prefix to use for pcap files.

   * \param d container of devices of type ns3::WifiNetDevice

106

   * \param d container of devices of type ns3::WifiNetDevice




namespace ns3 {

NS_LOG_COMPONENT_DEFINE ("NameList");

class NameListNode
{
public:
  NameListNode () {}
  ~NameListNode () {m_children.clear ();}

  uint32_t GetNChildren () {return m_children.size ();}
  NameListNode *GetChild (uint32_t n) {return m_children[n];}
  void AddChild (NameListNode *child) {m_children.push_back (child);}
  void SetName (std::string name) {m_name = name;}
private:
  std::vector<NameListNode *> m_children;
  std::string m_name;
};

/**
 * \brief private implementation detail of the NameList API.

Return to bug 215