fw: avoid setting PIT unsatisfy timer twice
refs #1448
Change-Id: If48a90be2b554bc7c1ea4b869e1a927bad578e0a
diff --git a/daemon/table/name-tree-entry.hpp b/daemon/table/name-tree-entry.hpp
index 6cf5bd6..0a0e05e 100644
--- a/daemon/table/name-tree-entry.hpp
+++ b/daemon/table/name-tree-entry.hpp
@@ -65,8 +65,6 @@
*/
class Entry : public enable_shared_from_this<Entry>, noncopyable
{
- // Make private members accessible by Name Tree
- friend class nfd::NameTree;
public:
explicit
Entry(const Name& prefix);
@@ -104,26 +102,19 @@
getFibEntry() const;
void
- insertPitEntry(shared_ptr<pit::Entry> pit);
+ insertPitEntry(shared_ptr<pit::Entry> pitEntry);
+
+ void
+ erasePitEntry(shared_ptr<pit::Entry> pitEntry);
bool
hasPitEntries() const;
- std::vector<shared_ptr<pit::Entry> >&
- getPitEntries();
-
const std::vector<shared_ptr<pit::Entry> >&
getPitEntries() const;
- /**
- * \brief Erase a PIT Entry
- * \details The address of this PIT Entry is required
- */
- bool
- erasePitEntry(shared_ptr<pit::Entry> pit);
-
void
- setMeasurementsEntry(shared_ptr<measurements::Entry> measurements);
+ setMeasurementsEntry(shared_ptr<measurements::Entry> measurementsEntry);
shared_ptr<measurements::Entry>
getMeasurementsEntry() const;
@@ -146,6 +137,8 @@
// get the Name Tree Node that is associated with this Name Tree Entry
Node* m_node;
+ // Make private members accessible by Name Tree
+ friend class nfd::NameTree;
};
inline const Name&
@@ -199,12 +192,6 @@
return !m_pitEntries.empty();
}
-inline std::vector<shared_ptr<pit::Entry> >&
-Entry::getPitEntries()
-{
- return m_pitEntries;
-}
-
inline const std::vector<shared_ptr<pit::Entry> >&
Entry::getPitEntries() const
{