management: NACK counters
refs #3174
Change-Id: I647cddc777e079dce4b7c7574ec2cccb04da6630
diff --git a/src/management/nfd-face-status.cpp b/src/management/nfd-face-status.cpp
index 30af9fb..ca24a99 100644
--- a/src/management/nfd-face-status.cpp
+++ b/src/management/nfd-face-status.cpp
@@ -37,8 +37,10 @@
: m_hasExpirationPeriod(false)
, m_nInInterests(0)
, m_nInDatas(0)
+ , m_nInNacks(0)
, m_nOutInterests(0)
, m_nOutDatas(0)
+ , m_nOutNacks(0)
, m_nInBytes(0)
, m_nOutBytes(0)
{
@@ -60,10 +62,14 @@
totalLength += prependNonNegativeIntegerBlock(encoder,
tlv::nfd::NInBytes, m_nInBytes);
totalLength += prependNonNegativeIntegerBlock(encoder,
+ tlv::nfd::NOutNacks, m_nOutNacks);
+ totalLength += prependNonNegativeIntegerBlock(encoder,
tlv::nfd::NOutDatas, m_nOutDatas);
totalLength += prependNonNegativeIntegerBlock(encoder,
tlv::nfd::NOutInterests, m_nOutInterests);
totalLength += prependNonNegativeIntegerBlock(encoder,
+ tlv::nfd::NInNacks, m_nInNacks);
+ totalLength += prependNonNegativeIntegerBlock(encoder,
tlv::nfd::NInDatas, m_nInDatas);
totalLength += prependNonNegativeIntegerBlock(encoder,
tlv::nfd::NInInterests, m_nInInterests);
@@ -195,6 +201,14 @@
BOOST_THROW_EXCEPTION(Error("missing required NInDatas field"));
}
+ if (val != m_wire.elements_end() && val->type() == tlv::nfd::NInNacks) {
+ m_nInNacks = readNonNegativeInteger(*val);
+ ++val;
+ }
+ else {
+ BOOST_THROW_EXCEPTION(Error("missing required NInNacks field"));
+ }
+
if (val != m_wire.elements_end() && val->type() == tlv::nfd::NOutInterests) {
m_nOutInterests = readNonNegativeInteger(*val);
++val;
@@ -211,6 +225,14 @@
BOOST_THROW_EXCEPTION(Error("missing required NOutDatas field"));
}
+ if (val != m_wire.elements_end() && val->type() == tlv::nfd::NOutNacks) {
+ m_nOutNacks = readNonNegativeInteger(*val);
+ ++val;
+ }
+ else {
+ BOOST_THROW_EXCEPTION(Error("missing required NOutNacks field"));
+ }
+
if (val != m_wire.elements_end() && val->type() == tlv::nfd::NInBytes) {
m_nInBytes = readNonNegativeInteger(*val);
++val;
@@ -254,6 +276,14 @@
}
FaceStatus&
+FaceStatus::setNInNacks(uint64_t nInNacks)
+{
+ m_wire.reset();
+ m_nInNacks = nInNacks;
+ return *this;
+}
+
+FaceStatus&
FaceStatus::setNOutInterests(uint64_t nOutInterests)
{
m_wire.reset();
@@ -270,6 +300,14 @@
}
FaceStatus&
+FaceStatus::setNOutNacks(uint64_t nOutNacks)
+{
+ m_wire.reset();
+ m_nOutNacks = nOutNacks;
+ return *this;
+}
+
+FaceStatus&
FaceStatus::setNInBytes(uint64_t nInBytes)
{
m_wire.reset();
@@ -313,6 +351,8 @@
<< "out: " << status.getNOutInterests() << "},\n"
<< " Data: {in: " << status.getNInDatas() << ", "
<< "out: " << status.getNOutDatas() << "},\n"
+ << " Nack: {in: " << status.getNInNacks() << ", "
+ << "out: " << status.getNOutNacks() << "},\n"
<< " bytes: {in: " << status.getNInBytes() << ", "
<< "out: " << status.getNOutBytes() << "} }\n"
<< ")";
diff --git a/src/management/nfd-face-status.hpp b/src/management/nfd-face-status.hpp
index f29b568..521f3d3 100644
--- a/src/management/nfd-face-status.hpp
+++ b/src/management/nfd-face-status.hpp
@@ -94,6 +94,15 @@
setNInDatas(uint64_t nInDatas);
uint64_t
+ getNInNacks() const
+ {
+ return m_nInNacks;
+ }
+
+ FaceStatus&
+ setNInNacks(uint64_t nInNacks);
+
+ uint64_t
getNOutInterests() const
{
return m_nOutInterests;
@@ -112,6 +121,15 @@
setNOutDatas(uint64_t nOutDatas);
uint64_t
+ getNOutNacks() const
+ {
+ return m_nOutNacks;
+ }
+
+ FaceStatus&
+ setNOutNacks(uint64_t nOutNacks);
+
+ uint64_t
getNInBytes() const
{
return m_nInBytes;
@@ -138,8 +156,10 @@
bool m_hasExpirationPeriod;
uint64_t m_nInInterests;
uint64_t m_nInDatas;
+ uint64_t m_nInNacks;
uint64_t m_nOutInterests;
uint64_t m_nOutDatas;
+ uint64_t m_nOutNacks;
uint64_t m_nInBytes;
uint64_t m_nOutBytes;
diff --git a/src/management/nfd-forwarder-status.cpp b/src/management/nfd-forwarder-status.cpp
index 81b3bb9..8292f19 100644
--- a/src/management/nfd-forwarder-status.cpp
+++ b/src/management/nfd-forwarder-status.cpp
@@ -43,8 +43,10 @@
, m_nCsEntries(0)
, m_nInInterests(0)
, m_nInDatas(0)
+ , m_nInNacks(0)
, m_nOutInterests(0)
, m_nOutDatas(0)
+ , m_nOutNacks(0)
{
}
@@ -59,10 +61,14 @@
{
size_t totalLength = 0;
+ totalLength += prependNonNegativeIntegerBlock(encoder, tlv::nfd::NOutNacks,
+ m_nOutNacks);
totalLength += prependNonNegativeIntegerBlock(encoder, tlv::nfd::NOutDatas,
m_nOutDatas);
totalLength += prependNonNegativeIntegerBlock(encoder, tlv::nfd::NOutInterests,
m_nOutInterests);
+ totalLength += prependNonNegativeIntegerBlock(encoder, tlv::nfd::NInNacks,
+ m_nInNacks);
totalLength += prependNonNegativeIntegerBlock(encoder, tlv::nfd::NInDatas,
m_nInDatas);
totalLength += prependNonNegativeIntegerBlock(encoder, tlv::nfd::NInInterests,
@@ -202,6 +208,14 @@
BOOST_THROW_EXCEPTION(Error("missing required NInDatas field"));
}
+ if (val != m_wire.elements_end() && val->type() == tlv::nfd::NInNacks) {
+ m_nInNacks = static_cast<uint64_t>(readNonNegativeInteger(*val));
+ ++val;
+ }
+ else {
+ BOOST_THROW_EXCEPTION(Error("missing required NInNacks field"));
+ }
+
if (val != m_wire.elements_end() && val->type() == tlv::nfd::NOutInterests) {
m_nOutInterests = static_cast<uint64_t>(readNonNegativeInteger(*val));
++val;
@@ -217,6 +231,14 @@
else {
BOOST_THROW_EXCEPTION(Error("missing required NOutDatas field"));
}
+
+ if (val != m_wire.elements_end() && val->type() == tlv::nfd::NOutNacks) {
+ m_nOutNacks = static_cast<uint64_t>(readNonNegativeInteger(*val));
+ ++val;
+ }
+ else {
+ BOOST_THROW_EXCEPTION(Error("missing required NInNacks field"));
+ }
}
ForwarderStatus&
@@ -300,6 +322,14 @@
}
ForwarderStatus&
+ForwarderStatus::setNInNacks(uint64_t nInNacks)
+{
+ m_wire.reset();
+ m_nInNacks = nInNacks;
+ return *this;
+}
+
+ForwarderStatus&
ForwarderStatus::setNOutInterests(uint64_t nOutInterests)
{
m_wire.reset();
@@ -315,5 +345,13 @@
return *this;
}
+ForwarderStatus&
+ForwarderStatus::setNOutNacks(uint64_t nOutNacks)
+{
+ m_wire.reset();
+ m_nOutNacks = nOutNacks;
+ return *this;
+}
+
} // namespace nfd
} // namespace ndn
diff --git a/src/management/nfd-forwarder-status.hpp b/src/management/nfd-forwarder-status.hpp
index 11f59e1..7083cb6 100644
--- a/src/management/nfd-forwarder-status.hpp
+++ b/src/management/nfd-forwarder-status.hpp
@@ -165,6 +165,15 @@
setNInDatas(uint64_t nInDatas);
uint64_t
+ getNInNacks() const
+ {
+ return m_nInNacks;
+ }
+
+ ForwarderStatus&
+ setNInNacks(uint64_t nInNacks);
+
+ uint64_t
getNOutInterests() const
{
return m_nOutInterests;
@@ -182,6 +191,15 @@
ForwarderStatus&
setNOutDatas(uint64_t nOutDatas);
+ uint64_t
+ getNOutNacks() const
+ {
+ return m_nOutNacks;
+ }
+
+ ForwarderStatus&
+ setNOutNacks(uint64_t nOutNacks);
+
private:
std::string m_nfdVersion;
time::system_clock::TimePoint m_startTimestamp;
@@ -193,8 +211,10 @@
size_t m_nCsEntries;
uint64_t m_nInInterests;
uint64_t m_nInDatas;
+ uint64_t m_nInNacks;
uint64_t m_nOutInterests;
uint64_t m_nOutDatas;
+ uint64_t m_nOutNacks;
mutable Block m_wire;
};