commit 72c0c64751593853fd4f97b0397ede2251515f4a
author Junxiao Shi <git@mail1.yoursunny.com> Fri Apr 20 15:41:09 2018 +0000
committer Junxiao Shi <git@mail1.yoursunny.com> Fri Apr 20 15:41:09 2018 +0000
tree 861b69cd3cf24febd16b0896d68e8841ba103f8b
parent 9c9672e230263ea14da98cddc9f7622db9aebc9d

encoding: provide FormattedOutputFunction for Block

refs #2225

Change-Id: Ie38539ff93293b3919789043b01e09b573fb619a

src/encoding/block.cpp

diff --git a/src/encoding/block.cpp b/src/encoding/block.cpp
index 691bbdf..2113064 100644
--- a/src/encoding/block.cpp
+++ b/src/encoding/block.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2017 Regents of the University of California.
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -25,6 +25,7 @@
 #include "buffer-stream.hpp"
 #include "encoding-buffer.hpp"
 #include "tlv.hpp"
+#include "../util/string-helper.hpp"
 
 #include <boost/asio/buffer.hpp>
 #include <boost/range/adaptor/reversed.hpp>
@@ -379,12 +380,19 @@
     return m_size;
   }
 
+  size_t len = encodeValue(estimator);
+  len += estimator.prependVarNumber(len);
+  len += estimator.prependVarNumber(m_type);
+  return len;
+}
+
+size_t
+Block::encodeValue(EncodingEstimator& estimator) const
+{
   size_t len = 0;
   for (const Block& element : m_elements | boost::adaptors::reversed) {
     len += element.encode(estimator);
   }
-  len += estimator.prependVarNumber(len);
-  len += estimator.prependVarNumber(m_type);
   return len;
 }
 
@@ -509,4 +517,31 @@
           std::memcmp(lhs.value(), rhs.value(), lhs.value_size()) == 0);
 }
 
+std::ostream&
+operator<<(std::ostream& os, const Block& block)
+{
+  auto oldFmt = os.flags(std::ios_base::dec);
+
+  if (block.empty()) {
+    os << "[invalid]";
+  }
+  else if (!block.m_elements.empty()) {
+    EncodingEstimator estimator;
+    size_t tlvLength = block.encodeValue(estimator);
+    os << block.type() << '[' << tlvLength << "]={";
+    std::copy(block.elements_begin(), block.elements_end(), make_ostream_joiner(os, ','));
+    os << '}';
+  }
+  else if (block.value_size() > 0) {
+    os << block.type() << '[' << block.value_size() << "]=";
+    printHex(os, block.value(), block.value_size(), true);
+  }
+  else {
+    os << block.type() << "[empty]";
+  }
+
+  os.flags(oldFmt);
+  return os;
+}
+
 } // namespace ndn