commit 1748b1e817176a8c433a39645ac17c02f1c4b2f4
author Junxiao Shi <git@mail1.yoursunny.com> Thu Sep 06 04:13:42 2018 +0000
committer Junxiao Shi <git@mail1.yoursunny.com> Thu Sep 06 04:13:42 2018 +0000
tree a91cb6b621b3c0fb8aea998983dec06f9e96abfa
parent fbda933b7b1b32963fc359259c8778d0cfa77346

prefix-ann: provide ==, !=, << operators

Also, ensure toData() adds correct ContentType.

refs #4650

Change-Id: I60956948766190cd713b58c85ba30b3701180b25

src/prefix-announcement.cpp

diff --git a/src/prefix-announcement.cpp b/src/prefix-announcement.cpp
index 6149526..410d270 100644
--- a/src/prefix-announcement.cpp
+++ b/src/prefix-announcement.cpp
@@ -74,6 +74,7 @@
     dataName.appendVersion(version.value_or(time::toUnixTimestamp(time::system_clock::now()).count()));
     dataName.appendSegment(0);
     m_data.emplace(dataName);
+    m_data->setContentType(tlv::ContentType_PrefixAnn);
 
     Block content(tlv::Content);
     content.push_back(makeNonNegativeIntegerBlock(tlv::nfd::ExpirationPeriod,
@@ -116,4 +117,22 @@
   return *this;
 }
 
+bool
+operator==(const PrefixAnnouncement& lhs, const PrefixAnnouncement& rhs)
+{
+  return lhs.getAnnouncedName() == rhs.getAnnouncedName() &&
+         lhs.getExpiration() == rhs.getExpiration() &&
+         lhs.getValidityPeriod() == rhs.getValidityPeriod();
+}
+
+std::ostream&
+operator<<(std::ostream& os, const PrefixAnnouncement& pa)
+{
+  os << pa.getAnnouncedName() << " expires=" << pa.getExpiration();
+  if (pa.getValidityPeriod()) {
+    os << " validity=" << *pa.getValidityPeriod();
+  }
+  return os;
+}
+
 } // namespace ndn

src/prefix-announcement.hpp

diff --git a/src/prefix-announcement.hpp b/src/prefix-announcement.hpp
index d811230..6c48015 100644
--- a/src/prefix-announcement.hpp
+++ b/src/prefix-announcement.hpp
@@ -119,10 +119,29 @@
 private:
   mutable optional<Data> m_data;
   Name m_announcedName;
-  time::milliseconds m_expiration;
+  time::milliseconds m_expiration = 0_ms;
   optional<security::ValidityPeriod> m_validity;
 };
 
+/** \brief Test whether two prefix announcements has the same name, expiration period,
+ *         and validity period.
+ */
+bool
+operator==(const PrefixAnnouncement& lhs, const PrefixAnnouncement& rhs);
+
+inline bool
+operator!=(const PrefixAnnouncement& lhs, const PrefixAnnouncement& rhs)
+{
+  return !(lhs == rhs);
+}
+
+/** \brief Print prefix announcement to a stream.
+ *
+ *  This string is for debugging purpose. Its syntax is not public API.
+ */
+std::ostream&
+operator<<(std::ostream& os, const PrefixAnnouncement& pa);
+
 } // namespace ndn
 
 #endif // NDN_CXX_PREFIX_ANNOUNCEMENT_HPP