Attachment #153 for bug #215

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




  NodeList::Iterator End (void) const;
  Ptr<Node> GetNode (uint32_t n);
  uint32_t GetNNodes (void);
  Ptr<Node> GetNodeByName (const std::string name);

  static Ptr<NodeListPriv> Get (void);
  

  return m_nodes[n];
}

Ptr<Node>
NodeListPriv::GetNodeByName (const std::string name)
{
  NS_LOG_FUNCTION_NOARGS ();
  uint32_t found = 0;
  Ptr<Node> foundNode = 0;
  for (std::vector<Ptr<Node> >::iterator i = m_nodes.begin ();
       i != m_nodes.end (); i++)
    {
      Ptr<Node> node = *i;
      if (node->GetName () == name)
        {
          foundNode = node;
          found++;
        }
    }
  if (found > 1)
    {
      NS_ASSERT_MSG (false, "More than one node with name: " << name);
    }
  return foundNode;
}

}

/**

{
  return NodeListPriv::Get ()->GetNode (n);
}
Ptr<Node>
NodeList::GetNodeByName (const std::string name)
{
  return NodeListPriv::Get ()->GetNodeByName (name);
}

}//namespace ns3

(-)a/src/node/node-list.h (+8 lines)

Lines 65-70 public:	Link Here

   * \returns the Node associated to index n.

   * \returns the Node associated to index n.

*/

*/

  static Ptr<Node> GetNode (uint32_t n);

  static Ptr<Node> GetNode (uint32_t n);

/**

   * \param name index of requested node.

   * \returns the Node associated to name, if found

   * This method returns a Ptr<Node> if a Node is found with that name.

   * If two or more Nodes have the same  name, the simulator asserts.

*/

  static Ptr<Node> GetNodeByName (const std::string name);

};

};

}//namespace ns3

}//namespace ns3

(-)a/src/node/node.cc (-6 / +43 lines)

Lines 53-68 Node::GetTypeId (void)	Link Here

  return tid;

  return tid;

Node::Node()

Node::Node ()

  : m_id(0),

  : m_id (0),

    m_sid(0)

    m_sid (0),

    m_name ("")

  Construct ();

  Construct ();

Node::Node(uint32_t sid)

Node::Node (uint32_t sid)

  : m_id(0),

  : m_id (0),

    m_sid(sid)

    m_sid (sid),

    m_name ("")

  Construct ();

  Construct ();

Lines 87-92 Node::GetSystemId (void) const	Link Here

  return m_sid;

  return m_sid;

void

Node::SetName (const std::string name)

  m_name = name;

100

std::string

101

Node::GetName (void) const

102

103

  return m_name;

104

105

uint32_t

106

uint32_t

Node::AddDevice (Ptr<NetDevice> device)

107

Node::AddDevice (Ptr<NetDevice> device)

Lines 110-115 Node::GetNDevices (void) const	Link Here

110

  return m_devices.size ();

125

  return m_devices.size ();

111

126

112

127

128

Ptr<NetDevice>

129

Node::GetDeviceByName (const std::string name) const

130

131

  uint32_t found = 0;

132

  Ptr<NetDevice> foundDevice = 0;

133

  for (std::vector<Ptr<NetDevice> >::const_iterator i = m_devices.begin ();

134

       i != m_devices.end (); i++)

135

136

      Ptr<NetDevice> device = *i;

137

      if (device->GetName () == name)

138

139

          foundDevice = device;

140

          found++;

141

142

143

  if (found > 1)

144

145

      NS_ASSERT_MSG (false, "More than one device with name: " << name);

146

147

  return foundDevice;

148

149

113

uint32_t

150

uint32_t

114

Node::AddApplication (Ptr<Application> application)

151

Node::AddApplication (Ptr<Application> application)

115

152

(-)a/src/node/node.h (-1 / +19 lines)

Lines 71-76 public:	Link Here

  virtual ~Node();

  virtual ~Node();

/**

/**

   * \param name name of the node (e.g. "n0")

*/

  void SetName (const std::string name);

/**

   * \return name name of the node (e.g. "n0")

*/

  std::string GetName (void) const;

/**

   * \returns the unique id of this node.

   * \returns the unique id of this node.

   * This unique id happens to be also the index of the Node into

   * This unique id happens to be also the index of the Node into

Lines 108-114 public:	Link Here

108

   *          to this Node.

117

   *          to this Node.

109

*/

118

*/

110

  uint32_t GetNDevices (void) const;

119

  uint32_t GetNDevices (void) const;

111

120

/**

121

   * \param name index of requested device.

122

   * \returns the NetDevice associated to name, if found

123

124

   * This method returns a Ptr<NetDevice> if a NetDevice is found with

125

   * that name.  If two or more NetDevices have the same name, the

126

   * simulator asserts.

127

*/

128

  Ptr<NetDevice> GetDeviceByName (const std::string name) const;

112

/**

129

/**

113

   * \param application Application to associate to this node.

130

   * \param application Application to associate to this node.

114

   * \returns the index of the Application within the Node's list

131

   * \returns the index of the Application within the Node's list

Lines 185-190 private:	Link Here

185

  typedef std::vector<struct Node::ProtocolHandlerEntry> ProtocolHandlerList;

202

  typedef std::vector<struct Node::ProtocolHandlerEntry> ProtocolHandlerList;

186

  uint32_t    m_id;         // Node id for this node

203

  uint32_t    m_id;         // Node id for this node

187

  uint32_t    m_sid;        // System id for this node

204

  uint32_t    m_sid;        // System id for this node

205

  std::string m_name;

188

  std::vector<Ptr<NetDevice> > m_devices;

206

  std::vector<Ptr<NetDevice> > m_devices;

189

  std::vector<Ptr<Application> > m_applications;

207

  std::vector<Ptr<Application> > m_applications;

190

  ProtocolHandlerList m_handlers;

208

  ProtocolHandlerList m_handlers;

Return to bug 215