management: add LocalUri field to nfd::FaceStatus and nfd::FaceEventNotification
add FaceFlags field to nfd::FaceStatus
refs #1396
Change-Id: Id8ad36c9874c968f779fcc5a2c210d39162e0a69
diff --git a/src/management/nfd-forwarder-status.hpp b/src/management/nfd-forwarder-status.hpp
index de8a93b..af1e05a 100644
--- a/src/management/nfd-forwarder-status.hpp
+++ b/src/management/nfd-forwarder-status.hpp
@@ -8,7 +8,6 @@
#define NDN_MANAGEMENT_NFD_FORWARDER_STATUS_HPP
#include "../encoding/tlv-nfd.hpp"
-#include "../encoding/tlv.hpp"
#include "../encoding/encoding-buffer.hpp"
namespace ndn {
@@ -260,8 +259,8 @@
, m_nInDatas(0)
, m_nOutInterests(0)
, m_nOutDatas(0)
- {
- }
+{
+}
template<bool T>
inline size_t
@@ -318,21 +317,8 @@
inline void
ForwarderStatus::wireDecode(const Block& block)
{
- m_nfdVersion = 0;
- m_startTimestamp = time::system_clock::TimePoint::min();
- m_currentTimestamp = time::system_clock::TimePoint::min();
- m_nNameTreeEntries = 0;
- m_nFibEntries = 0;
- m_nPitEntries = 0;
- m_nMeasurementsEntries = 0;
- m_nCsEntries = 0;
- m_nInInterests = 0;
- m_nInDatas = 0;
- m_nOutInterests = 0;
- m_nOutDatas = 0;
-
if (block.type() != Tlv::Content) {
- throw Error("Requested decoding of Status Payload, but block is not Content");
+ throw Error("expecting Content block for Status payload");
}
m_wire = block;
m_wire.parse();