commit 9f9bd8a3a31d92f344fcfa8cc08b2653f23f6ef3
author Davide Pesavento <davide.pesavento@lip6.fr> Mon Feb 06 00:33:32 2017 -0500
committer Davide Pesavento <davide.pesavento@lip6.fr> Tue Feb 07 00:44:56 2017 -0500
tree cd595c75e6c66f26c100afcc08630f8e9dd87e04
parent eba76ad8f6addea3aef8817beffc72c616f48d01

mgmt: ChannelStatus equality operators and formatted output

Change-Id: I17745976af96d4dda3d6717eefd760fd52ebfb71
Refs: #3903

src/mgmt/nfd/channel-status.cpp

diff --git a/src/mgmt/nfd/channel-status.cpp b/src/mgmt/nfd/channel-status.cpp
index bbbfdf4..c2a9b63 100644
--- a/src/mgmt/nfd/channel-status.cpp
+++ b/src/mgmt/nfd/channel-status.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /**
- * Copyright (c) 2013-2016 Regents of the University of California.
+ * Copyright (c) 2013-2017 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -20,22 +20,16 @@
  */
 
 #include "channel-status.hpp"
+#include "encoding/encoding-buffer.hpp"
 #include "encoding/tlv-nfd.hpp"
-#include "encoding/block-helpers.hpp"
 #include "util/concepts.hpp"
 
 namespace ndn {
 namespace nfd {
 
-//BOOST_CONCEPT_ASSERT((boost::EqualityComparable<ChannelStatus>));
-BOOST_CONCEPT_ASSERT((WireEncodable<ChannelStatus>));
-BOOST_CONCEPT_ASSERT((WireDecodable<ChannelStatus>));
-static_assert(std::is_base_of<tlv::Error, ChannelStatus::Error>::value,
-              "ChannelStatus::Error must inherit from tlv::Error");
+BOOST_CONCEPT_ASSERT((StatusDatasetItem<ChannelStatus>));
 
-ChannelStatus::ChannelStatus()
-{
-}
+ChannelStatus::ChannelStatus() = default;
 
 ChannelStatus::ChannelStatus(const Block& payload)
 {
@@ -49,7 +43,7 @@
   size_t totalLength = 0;
 
   totalLength += encoder.prependByteArrayBlock(tlv::nfd::LocalUri,
-                 reinterpret_cast<const uint8_t*>(m_localUri.c_str()), m_localUri.size());
+                 reinterpret_cast<const uint8_t*>(m_localUri.data()), m_localUri.size());
 
   totalLength += encoder.prependVarNumber(totalLength);
   totalLength += encoder.prependVarNumber(tlv::nfd::ChannelStatus);
@@ -105,5 +99,17 @@
   return *this;
 }
 
+bool
+operator==(const ChannelStatus& a, const ChannelStatus& b)
+{
+  return a.getLocalUri() == b.getLocalUri();
+}
+
+std::ostream&
+operator<<(std::ostream& os, const ChannelStatus& cs)
+{
+  return os << "Channel(" << "LocalUri: " << cs.getLocalUri() << ")";
+}
+
 } // namespace nfd
 } // namespace ndn

src/mgmt/nfd/channel-status.hpp

diff --git a/src/mgmt/nfd/channel-status.hpp b/src/mgmt/nfd/channel-status.hpp
index 5a2aae8..16eb419 100644
--- a/src/mgmt/nfd/channel-status.hpp
+++ b/src/mgmt/nfd/channel-status.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /**
- * Copyright (c) 2013-2016 Regents of the University of California.
+ * Copyright (c) 2013-2017 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -76,6 +76,18 @@
   mutable Block m_wire;
 };
 
+bool
+operator==(const ChannelStatus& a, const ChannelStatus& b);
+
+inline bool
+operator!=(const ChannelStatus& a, const ChannelStatus& b)
+{
+  return !(a == b);
+}
+
+std::ostream&
+operator<<(std::ostream& os, const ChannelStatus& cs);
+
 } // namespace nfd
 } // namespace ndn