From a04ea625f7f97309a81dc02f14d4138066bb66df Mon Sep 17 00:00:00 2001
From: Tom Henderson <tomh@tomh.org>
Date: Thu, 9 Aug 2018 05:53:06 -0700
Subject: [PATCH] network:  Add NodeContainer::Contains()

---
 CHANGES.html                         |  2 ++
 RELEASE_NOTES                        |  2 ++
 src/network/helper/node-container.cc | 13 +++++++++++++
 src/network/helper/node-container.h  |  8 ++++++++
 4 files changed, 25 insertions(+)

diff --git a/CHANGES.html b/CHANGES.html
index 5e9cfcdf5..5d1cc98ab 100644
--- a/CHANGES.html
+++ b/CHANGES.html
@@ -64,6 +64,8 @@ nodes to be placed outside of buildings defined in the scenario.</li>
   <li> Added a priority queue disc (PrioQueueDisc).</li>
   <li> Added a new trace source in StaWifiMac for tracing beacon arrivals</li>
   <li> Added a new helper method to ApplicationContainer to start applications with some jitter around the start time</li>
+  <li> (network) Add a method to check whether a node with a given ID is within a NodeContainer.</li>
+
 </ul>
 <h2>Changes to existing API:</h2>
 <ul>
diff --git a/RELEASE_NOTES b/RELEASE_NOTES
index 896a67279..55748c7b6 100644
--- a/RELEASE_NOTES
+++ b/RELEASE_NOTES
@@ -32,6 +32,8 @@ New user-visible features
 - (wifi) Add a new trace source to StaWifiMac to trace beacon arrivals
 - (network) Add a method to allow random variable-based jitter to be added
   to the start times of applications in a container.
+- (network) Add a method to check whether a node with a given ID is within
+  a NodeContainer.
 
 Bugs fixed
 ----------
diff --git a/src/network/helper/node-container.cc b/src/network/helper/node-container.cc
index 6e1d66770..cf03e27b5 100644
--- a/src/network/helper/node-container.cc
+++ b/src/network/helper/node-container.cc
@@ -136,4 +136,17 @@ NodeContainer::GetGlobal (void)
   return c;
 }
 
+bool
+NodeContainer::Contains (uint32_t id) const
+{
+  for (uint32_t i = 0; i < m_nodes.size (); i++)
+    {
+      if (m_nodes[i]->GetId () == id)
+        {
+          return true;
+        }
+    }
+  return false;
+}
+
 } // namespace ns3
diff --git a/src/network/helper/node-container.h b/src/network/helper/node-container.h
index 967da9d51..a602a5a6d 100644
--- a/src/network/helper/node-container.h
+++ b/src/network/helper/node-container.h
@@ -288,6 +288,14 @@ public:
    */
   static NodeContainer GetGlobal (void);
 
+  /**
+   * \brief Return true if container contains a Node with index id
+   *
+   * \return whether the NodeContainer contains a node with index id
+   * \param id Node Id
+   */
+  bool Contains (uint32_t id) const;
+
 private:
   std::vector<Ptr<Node> > m_nodes; //!< Nodes smart pointers
 };