management: link-layer byte counts in FaceStatus
refs #1765
Change-Id: I3a904804509fff6704002c155db0abe82d88f5fa
diff --git a/src/encoding/tlv-nfd.hpp b/src/encoding/tlv-nfd.hpp
index 63776fb..011ad32 100644
--- a/src/encoding/tlv-nfd.hpp
+++ b/src/encoding/tlv-nfd.hpp
@@ -55,10 +55,6 @@
NPitEntries = 133,
NMeasurementsEntries = 134,
NCsEntries = 135,
- NInInterests = 144,
- NInDatas = 145,
- NOutInterests = 146,
- NOutDatas = 147,
// Face Management
FaceStatus = 128,
@@ -68,6 +64,14 @@
FaceEventNotification = 192,
FaceEventKind = 193,
+ // ForwarderStatus and FaceStatus counters
+ NInInterests = 144,
+ NInDatas = 145,
+ NOutInterests = 146,
+ NOutDatas = 147,
+ NInBytes = 148,
+ NOutBytes = 149,
+
// FIB Management
FibEntry = 128,
NextHopRecord = 129,
@@ -89,7 +93,7 @@
namespace nfd {
-const uint64_t INVALID_FACE_ID = std::numeric_limits<uint64_t>::max();
+static const uint64_t INVALID_FACE_ID = std::numeric_limits<uint64_t>::max();
} // namespace nfd
diff --git a/src/management/nfd-face-status.cpp b/src/management/nfd-face-status.cpp
new file mode 100644
index 0000000..adf29c2
--- /dev/null
+++ b/src/management/nfd-face-status.cpp
@@ -0,0 +1,227 @@
+/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
+/**
+ * Copyright (c) 2013-2014 Regents of the University of California.
+ *
+ * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
+ *
+ * ndn-cxx library is free software: you can redistribute it and/or modify it under the
+ * terms of the GNU Lesser General Public License as published by the Free Software
+ * Foundation, either version 3 of the License, or (at your option) any later version.
+ *
+ * ndn-cxx library is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ *
+ * You should have received copies of the GNU General Public License and GNU Lesser
+ * General Public License along with ndn-cxx, e.g., in COPYING.md file. If not, see
+ * <http://www.gnu.org/licenses/>.
+ *
+ * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
+ */
+
+#include "nfd-face-status.hpp"
+
+namespace ndn {
+namespace nfd {
+
+FaceStatus::FaceStatus()
+ : m_faceId(0)
+ , m_hasExpirationPeriod(false)
+ , m_flags(0)
+ , m_nInInterests(0)
+ , m_nInDatas(0)
+ , m_nOutInterests(0)
+ , m_nOutDatas(0)
+ , m_nInBytes(0)
+ , m_nOutBytes(0)
+{
+}
+
+template<bool T>
+size_t
+FaceStatus::wireEncode(EncodingImpl<T>& encoder) const
+{
+ size_t totalLength = 0;
+
+ totalLength += prependNonNegativeIntegerBlock(encoder,
+ tlv::nfd::NOutBytes, m_nOutBytes);
+ totalLength += prependNonNegativeIntegerBlock(encoder,
+ tlv::nfd::NInBytes, m_nInBytes);
+ totalLength += prependNonNegativeIntegerBlock(encoder,
+ tlv::nfd::NOutDatas, m_nOutDatas);
+ totalLength += prependNonNegativeIntegerBlock(encoder,
+ tlv::nfd::NOutInterests, m_nOutInterests);
+ totalLength += prependNonNegativeIntegerBlock(encoder,
+ tlv::nfd::NInDatas, m_nInDatas);
+ totalLength += prependNonNegativeIntegerBlock(encoder,
+ tlv::nfd::NInInterests, m_nInInterests);
+ totalLength += prependNonNegativeIntegerBlock(encoder,
+ tlv::nfd::FaceFlags, m_flags);
+ if (m_hasExpirationPeriod) {
+ totalLength += prependNonNegativeIntegerBlock(encoder,
+ tlv::nfd::ExpirationPeriod, m_expirationPeriod.count());
+ }
+ totalLength += prependByteArrayBlock(encoder, tlv::nfd::LocalUri,
+ reinterpret_cast<const uint8_t*>(m_localUri.c_str()), m_localUri.size());
+ totalLength += prependByteArrayBlock(encoder, tlv::nfd::Uri,
+ reinterpret_cast<const uint8_t*>(m_remoteUri.c_str()), m_remoteUri.size());
+ totalLength += prependNonNegativeIntegerBlock(encoder,
+ tlv::nfd::FaceId, m_faceId);
+
+ totalLength += encoder.prependVarNumber(totalLength);
+ totalLength += encoder.prependVarNumber(tlv::nfd::FaceStatus);
+ return totalLength;
+}
+
+template size_t
+FaceStatus::wireEncode<true>(EncodingImpl<true>& block) const;
+
+template size_t
+FaceStatus::wireEncode<false>(EncodingImpl<false>& block) const;
+
+const Block&
+FaceStatus::wireEncode() const
+{
+ if (m_wire.hasWire())
+ return m_wire;
+
+ EncodingEstimator estimator;
+ size_t estimatedSize = wireEncode(estimator);
+
+ EncodingBuffer buffer(estimatedSize, 0);
+ wireEncode(buffer);
+
+ m_wire = buffer.block();
+ return m_wire;
+}
+
+void
+FaceStatus::wireDecode(const Block& block)
+{
+ if (block.type() != tlv::nfd::FaceStatus) {
+ throw Error("expecting FaceStatus block");
+ }
+ m_wire = block;
+ m_wire.parse();
+ Block::element_const_iterator val = m_wire.elements_begin();
+
+ if (val != m_wire.elements_end() && val->type() == tlv::nfd::FaceId) {
+ m_faceId = readNonNegativeInteger(*val);
+ ++val;
+ }
+ else {
+ throw Error("missing required FaceId field");
+ }
+
+ if (val != m_wire.elements_end() && val->type() == tlv::nfd::Uri) {
+ m_remoteUri.assign(reinterpret_cast<const char*>(val->value()), val->value_size());
+ ++val;
+ }
+ else {
+ throw Error("missing required Uri field");
+ }
+
+ if (val != m_wire.elements_end() && val->type() == tlv::nfd::LocalUri) {
+ m_localUri.assign(reinterpret_cast<const char*>(val->value()), val->value_size());
+ ++val;
+ }
+ else {
+ throw Error("missing required LocalUri field");
+ }
+
+ if (val != m_wire.elements_end() && val->type() == tlv::nfd::ExpirationPeriod) {
+ m_expirationPeriod = time::milliseconds(readNonNegativeInteger(*val));
+ m_hasExpirationPeriod = true;
+ ++val;
+ }
+ else {
+ m_hasExpirationPeriod = false;
+ // ExpirationPeriod is optional
+ }
+
+ if (val != m_wire.elements_end() && val->type() == tlv::nfd::FaceFlags) {
+ m_flags = readNonNegativeInteger(*val);
+ ++val;
+ }
+ else {
+ throw Error("missing required FaceFlags field");
+ }
+
+ if (val != m_wire.elements_end() && val->type() == tlv::nfd::NInInterests) {
+ m_nInInterests = readNonNegativeInteger(*val);
+ ++val;
+ }
+ else {
+ throw Error("missing required NInInterests field");
+ }
+
+ if (val != m_wire.elements_end() && val->type() == tlv::nfd::NInDatas) {
+ m_nInDatas = readNonNegativeInteger(*val);
+ ++val;
+ }
+ else {
+ throw Error("missing required NInDatas field");
+ }
+
+ if (val != m_wire.elements_end() && val->type() == tlv::nfd::NOutInterests) {
+ m_nOutInterests = readNonNegativeInteger(*val);
+ ++val;
+ }
+ else {
+ throw Error("missing required NOutInterests field");
+ }
+
+ if (val != m_wire.elements_end() && val->type() == tlv::nfd::NOutDatas) {
+ m_nOutDatas = readNonNegativeInteger(*val);
+ ++val;
+ }
+ else {
+ throw Error("missing required NOutDatas field");
+ }
+
+ if (val != m_wire.elements_end() && val->type() == tlv::nfd::NInBytes) {
+ m_nInBytes = readNonNegativeInteger(*val);
+ ++val;
+ }
+ else {
+ throw Error("missing required NInBytes field");
+ }
+
+ if (val != m_wire.elements_end() && val->type() == tlv::nfd::NOutBytes) {
+ m_nOutBytes = readNonNegativeInteger(*val);
+ ++val;
+ }
+ else {
+ throw Error("missing required NOutBytes field");
+ }
+}
+
+std::ostream&
+operator<<(std::ostream& os, const FaceStatus& status)
+{
+ os << "FaceStatus("
+ << "FaceID: " << status.getFaceId() << ",\n"
+ << "RemoteUri: " << status.getRemoteUri() << ",\n"
+ << "LocalUri: " << status.getLocalUri() << ",\n";
+
+ if (status.hasExpirationPeriod()) {
+ os << "ExpirationPeriod: " << status.getExpirationPeriod() << ",\n";
+ }
+ else {
+ os << "ExpirationPeriod: infinite,\n";
+ }
+
+ os << "Flags: " << status.getFlags() << ",\n"
+ << "Counters: { Interests: {in: " << status.getNInInterests() << ", "
+ << "out: " << status.getNOutInterests() << "},\n"
+ << " Data: {in: " << status.getNInDatas() << ", "
+ << "out: " << status.getNOutDatas() << "},\n"
+ << " bytes: {in: " << status.getNInBytes() << ", "
+ << "out: " << status.getNOutBytes() << "} }\n"
+ << ")";
+ return os;
+}
+
+} // namespace nfd
+} // namespace ndn
+
diff --git a/src/management/nfd-face-status.hpp b/src/management/nfd-face-status.hpp
index a92e154..1b33dea 100644
--- a/src/management/nfd-face-status.hpp
+++ b/src/management/nfd-face-status.hpp
@@ -209,6 +209,34 @@
return *this;
}
+ uint64_t
+ getNInBytes() const
+ {
+ return m_nInBytes;
+ }
+
+ FaceStatus&
+ setNInBytes(uint64_t nInBytes)
+ {
+ m_wire.reset();
+ m_nInBytes = nInBytes;
+ return *this;
+ }
+
+ uint64_t
+ getNOutBytes() const
+ {
+ return m_nOutBytes;
+ }
+
+ FaceStatus&
+ setNOutBytes(uint64_t nOutBytes)
+ {
+ m_wire.reset();
+ m_nOutBytes = nOutBytes;
+ return *this;
+ }
+
private:
uint64_t m_faceId;
std::string m_remoteUri;
@@ -220,176 +248,14 @@
uint64_t m_nInDatas;
uint64_t m_nOutInterests;
uint64_t m_nOutDatas;
+ uint64_t m_nInBytes;
+ uint64_t m_nOutBytes;
mutable Block m_wire;
};
-inline
-FaceStatus::FaceStatus()
- : m_faceId(0)
- , m_hasExpirationPeriod(false)
- , m_flags(0)
- , m_nInInterests(0)
- , m_nInDatas(0)
- , m_nOutInterests(0)
- , m_nOutDatas(0)
-{
-}
-
-template<bool T>
-inline size_t
-FaceStatus::wireEncode(EncodingImpl<T>& encoder) const
-{
- size_t totalLength = 0;
-
- totalLength += prependNonNegativeIntegerBlock(encoder,
- tlv::nfd::NOutDatas, m_nOutDatas);
- totalLength += prependNonNegativeIntegerBlock(encoder,
- tlv::nfd::NOutInterests, m_nOutInterests);
- totalLength += prependNonNegativeIntegerBlock(encoder,
- tlv::nfd::NInDatas, m_nInDatas);
- totalLength += prependNonNegativeIntegerBlock(encoder,
- tlv::nfd::NInInterests, m_nInInterests);
- totalLength += prependNonNegativeIntegerBlock(encoder,
- tlv::nfd::FaceFlags, m_flags);
- if (m_hasExpirationPeriod) {
- totalLength += prependNonNegativeIntegerBlock(encoder,
- tlv::nfd::ExpirationPeriod, m_expirationPeriod.count());
- }
- totalLength += prependByteArrayBlock(encoder, tlv::nfd::LocalUri,
- reinterpret_cast<const uint8_t*>(m_localUri.c_str()), m_localUri.size());
- totalLength += prependByteArrayBlock(encoder, tlv::nfd::Uri,
- reinterpret_cast<const uint8_t*>(m_remoteUri.c_str()), m_remoteUri.size());
- totalLength += prependNonNegativeIntegerBlock(encoder,
- tlv::nfd::FaceId, m_faceId);
-
- totalLength += encoder.prependVarNumber(totalLength);
- totalLength += encoder.prependVarNumber(tlv::nfd::FaceStatus);
- return totalLength;
-}
-
-inline const Block&
-FaceStatus::wireEncode() const
-{
- if (m_wire.hasWire())
- return m_wire;
-
- EncodingEstimator estimator;
- size_t estimatedSize = wireEncode(estimator);
-
- EncodingBuffer buffer(estimatedSize, 0);
- wireEncode(buffer);
-
- m_wire = buffer.block();
- return m_wire;
-}
-
-inline void
-FaceStatus::wireDecode(const Block& block)
-{
- if (block.type() != tlv::nfd::FaceStatus) {
- throw Error("expecting FaceStatus block");
- }
- m_wire = block;
- m_wire.parse();
- Block::element_const_iterator val = m_wire.elements_begin();
-
- if (val != m_wire.elements_end() && val->type() == tlv::nfd::FaceId) {
- m_faceId = readNonNegativeInteger(*val);
- ++val;
- }
- else {
- throw Error("missing required FaceId field");
- }
-
- if (val != m_wire.elements_end() && val->type() == tlv::nfd::Uri) {
- m_remoteUri.assign(reinterpret_cast<const char*>(val->value()), val->value_size());
- ++val;
- }
- else {
- throw Error("missing required Uri field");
- }
-
- if (val != m_wire.elements_end() && val->type() == tlv::nfd::LocalUri) {
- m_localUri.assign(reinterpret_cast<const char*>(val->value()), val->value_size());
- ++val;
- }
- else {
- throw Error("missing required LocalUri field");
- }
-
- if (val != m_wire.elements_end() && val->type() == tlv::nfd::ExpirationPeriod) {
- m_expirationPeriod = time::milliseconds(readNonNegativeInteger(*val));
- m_hasExpirationPeriod = true;
- ++val;
- }
- else {
- m_hasExpirationPeriod = false;
- // ExpirationPeriod is optional
- }
-
- if (val != m_wire.elements_end() && val->type() == tlv::nfd::FaceFlags) {
- m_flags = readNonNegativeInteger(*val);
- ++val;
- }
- else {
- throw Error("missing required FaceFlags field");
- }
-
- if (val != m_wire.elements_end() && val->type() == tlv::nfd::NInInterests) {
- m_nInInterests = readNonNegativeInteger(*val);
- ++val;
- }
- else {
- throw Error("missing required NInInterests field");
- }
-
- if (val != m_wire.elements_end() && val->type() == tlv::nfd::NInDatas) {
- m_nInDatas = readNonNegativeInteger(*val);
- ++val;
- }
- else {
- throw Error("missing required NInDatas field");
- }
-
- if (val != m_wire.elements_end() && val->type() == tlv::nfd::NOutInterests) {
- m_nOutInterests = readNonNegativeInteger(*val);
- ++val;
- }
- else {
- throw Error("missing required NOutInterests field");
- }
-
- if (val != m_wire.elements_end() && val->type() == tlv::nfd::NOutDatas) {
- m_nOutDatas = readNonNegativeInteger(*val);
- ++val;
- }
- else {
- throw Error("missing required NOutDatas field");
- }
-}
-
-inline std::ostream&
-operator<<(std::ostream& os, const FaceStatus& status)
-{
- os << "FaceStatus("
- << "FaceID: " << status.getFaceId() << ", "
- << "RemoteUri: " << status.getRemoteUri() << ", "
- << "LocalUri: " << status.getLocalUri() << ", ";
-
- if (status.hasExpirationPeriod()) {
- os << "ExpirationPeriod: " << status.getExpirationPeriod() << ", ";
- }
- else {
- os << "ExpirationPeriod: infinite, ";
- }
-
- os << "Flags: " << status.getFlags() << ", "
- << "Counters: " << status.getNInInterests() << "|" << status.getNInDatas()
- << "|" << status.getNOutInterests() << "|" << status.getNOutDatas()
- << ")";
- return os;
-}
+std::ostream&
+operator<<(std::ostream& os, const FaceStatus& status);
} // namespace nfd
} // namespace ndn
diff --git a/tests/unit-tests/management/test-nfd-face-status.cpp b/tests/unit-tests/management/test-nfd-face-status.cpp
index 2691645..22c7264 100644
--- a/tests/unit-tests/management/test-nfd-face-status.cpp
+++ b/tests/unit-tests/management/test-nfd-face-status.cpp
@@ -39,7 +39,9 @@
.setNInInterests(10)
.setNInDatas(200)
.setNOutInterests(3000)
- .setNOutDatas(4);
+ .setNOutDatas(4)
+ .setNInBytes(1329719163)
+ .setNOutBytes(999110448);
Block wire;
BOOST_REQUIRE_NO_THROW(wire = status1.wireEncode());
@@ -50,15 +52,16 @@
// printf("0x%02x, ", *it);
// }
static const uint8_t expected[] = {
- 0x80, 0x46, 0x69, 0x01, 0x64, 0x72, 0x15, 0x74, 0x63, 0x70, 0x34, 0x3a,
+ 0x80, 0x52, 0x69, 0x01, 0x64, 0x72, 0x15, 0x74, 0x63, 0x70, 0x34, 0x3a,
0x2f, 0x2f, 0x31, 0x39, 0x32, 0x2e, 0x30, 0x2e, 0x32, 0x2e, 0x31, 0x3a,
0x36, 0x33, 0x36, 0x33, 0x81, 0x16, 0x74, 0x63, 0x70, 0x34, 0x3a, 0x2f,
0x2f, 0x31, 0x39, 0x32, 0x2e, 0x30, 0x2e, 0x32, 0x2e, 0x32, 0x3a, 0x35,
0x35, 0x35, 0x35, 0x35, 0x6d, 0x02, 0x27, 0x10, 0xc2, 0x01, 0x02, 0x90,
- 0x01, 0x0a, 0x91, 0x01, 0xc8, 0x92, 0x02, 0x0b, 0xb8, 0x93, 0x01, 0x04
+ 0x01, 0x0a, 0x91, 0x01, 0xc8, 0x92, 0x02, 0x0b, 0xb8, 0x93, 0x01, 0x04,
+ 0x94, 0x04, 0x4f, 0x41, 0xe7, 0x7b, 0x95, 0x04, 0x3b, 0x8d, 0x37, 0x30
};
- BOOST_REQUIRE_EQUAL_COLLECTIONS(expected, expected + sizeof(expected),
- wire.begin(), wire.end());
+ BOOST_CHECK_EQUAL_COLLECTIONS(expected, expected + sizeof(expected),
+ wire.begin(), wire.end());
BOOST_REQUIRE_NO_THROW(FaceStatus(wire));
FaceStatus status2(wire);
@@ -70,15 +73,20 @@
BOOST_CHECK_EQUAL(status1.getNInDatas(), status2.getNInDatas());
BOOST_CHECK_EQUAL(status1.getNOutInterests(), status2.getNOutInterests());
BOOST_CHECK_EQUAL(status1.getNOutDatas(), status2.getNOutDatas());
+ BOOST_CHECK_EQUAL(status1.getNInBytes(), status2.getNInBytes());
+ BOOST_CHECK_EQUAL(status1.getNOutBytes(), status2.getNOutBytes());
std::ostringstream os;
os << status2;
- BOOST_CHECK_EQUAL(os.str(), "FaceStatus(FaceID: 100, "
- "RemoteUri: tcp4://192.0.2.1:6363, "
- "LocalUri: tcp4://192.0.2.2:55555, "
- "ExpirationPeriod: 10000 milliseconds, "
- "Flags: 2, "
- "Counters: 10|200|3000|4)");
+ BOOST_CHECK_EQUAL(os.str(), "FaceStatus(FaceID: 100,\n"
+ "RemoteUri: tcp4://192.0.2.1:6363,\n"
+ "LocalUri: tcp4://192.0.2.2:55555,\n"
+ "ExpirationPeriod: 10000 milliseconds,\n"
+ "Flags: 2,\n"
+ "Counters: { Interests: {in: 10, out: 3000},\n"
+ " Data: {in: 200, out: 4},\n"
+ " bytes: {in: 1329719163, out: 999110448} }\n"
+ ")");
}
BOOST_AUTO_TEST_SUITE_END()