management: nfd::ForwarderStatus
nfd::Status is renamed to ForwarderStatus.
Fields are swapped according to new Management protocol.
ForwarderStatus::wireEncode uses Content as outermost element.
refs #1422
Change-Id: I388d5eb56eed2a9958a27e51e010c696e9608ca9
diff --git a/src/management/nfd-status.hpp b/src/management/nfd-status.hpp
index e00c705..4725a66 100644
--- a/src/management/nfd-status.hpp
+++ b/src/management/nfd-status.hpp
@@ -7,336 +7,14 @@
#ifndef NDN_MANAGEMENT_NFD_STATUS_HPP
#define NDN_MANAGEMENT_NFD_STATUS_HPP
-#include "../encoding/tlv-nfd.hpp"
-#include "../encoding/tlv.hpp"
-#include "../encoding/encoding-buffer.hpp"
-#include <boost/chrono/include.hpp>
+#include "nfd-forwarder-status.hpp"
namespace ndn {
namespace nfd {
-class Status {
-public:
- struct Error : public Tlv::Error
- {
- Error(const std::string& what)
- : Tlv::Error(what)
- {
- }
- };
-
- Status();
-
- explicit
- Status(const Block& payload)
- {
- this->wireDecode(payload);
- }
-
- // Status is encoded as a series of blocks within Data Payload, not a single block.
- // Thus there is no "const Block& wireEncode() const" method.
-
- template<bool T>
- size_t
- wireEncode(EncodingImpl<T>& encoder) const;
-
- void
- wireDecode(const Block& payload);
-
-public:
- int
- getNfdVersion() const
- {
- return m_nfdVersion;
- }
-
- void
- setNfdVersion(int nfdVersion)
- {
- m_nfdVersion = nfdVersion;
- }
-
- const time::system_clock::TimePoint&
- getStartTimestamp() const
- {
- return m_startTimestamp;
- }
-
- void
- setStartTimestamp(const time::system_clock::TimePoint& startTimestamp)
- {
- m_startTimestamp = startTimestamp;
- }
-
- const time::system_clock::TimePoint&
- getCurrentTimestamp() const
- {
- return m_currentTimestamp;
- }
-
- void
- setCurrentTimestamp(const time::system_clock::TimePoint& currentTimestamp)
- {
- m_currentTimestamp = currentTimestamp;
- }
-
- size_t
- getNNameTreeEntries() const
- {
- return m_nNameTreeEntries;
- }
-
- void
- setNNameTreeEntries(size_t nNameTreeEntries)
- {
- m_nNameTreeEntries = nNameTreeEntries;
- }
-
- size_t
- getNFibEntries() const
- {
- return m_nFibEntries;
- }
-
- void
- setNFibEntries(size_t nFibEntries)
- {
- m_nFibEntries = nFibEntries;
- }
-
- size_t
- getNPitEntries() const
- {
- return m_nPitEntries;
- }
-
- void
- setNPitEntries(size_t nPitEntries)
- {
- m_nPitEntries = nPitEntries;
- }
-
- size_t
- getNMeasurementsEntries() const
- {
- return m_nMeasurementsEntries;
- }
-
- void
- setNMeasurementsEntries(size_t nMeasurementsEntries)
- {
- m_nMeasurementsEntries = nMeasurementsEntries;
- }
-
- size_t
- getNCsEntries() const
- {
- return m_nCsEntries;
- }
-
- void
- setNCsEntries(size_t nCsEntries)
- {
- m_nCsEntries = nCsEntries;
- }
-
- int
- getNInInterests() const
- {
- return m_nInInterests;
- }
-
- void
- setNInInterests(int nInInterests)
- {
- m_nInInterests = nInInterests;
- }
-
- int
- getNOutInterests() const
- {
- return m_nOutInterests;
- }
-
- void
- setNOutInterests(int nOutInterests)
- {
- m_nOutInterests = nOutInterests;
- }
-
- int
- getNInDatas() const
- {
- return m_nInDatas;
- }
-
- void
- setNInDatas(int nInDatas)
- {
- m_nInDatas = nInDatas;
- }
-
- int
- getNOutDatas() const
- {
- return m_nOutDatas;
- }
-
- void
- setNOutDatas(int nOutDatas)
- {
- m_nOutDatas = nOutDatas;
- }
-
-private:
- int m_nfdVersion;
- time::system_clock::TimePoint m_startTimestamp;
- time::system_clock::TimePoint m_currentTimestamp;
- size_t m_nNameTreeEntries;
- size_t m_nFibEntries;
- size_t m_nPitEntries;
- size_t m_nMeasurementsEntries;
- size_t m_nCsEntries;
- int m_nInInterests;
- int m_nOutInterests;
- int m_nInDatas;
- int m_nOutDatas;
-};
-
-inline
-Status::Status()
- : 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_nOutInterests(0)
- , m_nInDatas(0)
- , m_nOutDatas(0)
- {
- }
-
-template<bool T>
-inline size_t
-Status::wireEncode(EncodingImpl<T>& encoder) const
-{
- size_t total_len = 0;
-
- total_len += prependNonNegativeIntegerBlock(encoder, tlv::nfd::NOutDatas,
- m_nOutDatas);
- total_len += prependNonNegativeIntegerBlock(encoder, tlv::nfd::NInDatas,
- m_nInDatas);
- total_len += prependNonNegativeIntegerBlock(encoder, tlv::nfd::NOutInterests,
- m_nOutInterests);
- total_len += prependNonNegativeIntegerBlock(encoder, tlv::nfd::NInInterests,
- m_nInInterests);
- total_len += prependNonNegativeIntegerBlock(encoder, tlv::nfd::NCsEntries,
- m_nCsEntries);
- total_len += prependNonNegativeIntegerBlock(encoder, tlv::nfd::NMeasurementsEntries,
- m_nMeasurementsEntries);
- total_len += prependNonNegativeIntegerBlock(encoder, tlv::nfd::NPitEntries,
- m_nPitEntries);
- total_len += prependNonNegativeIntegerBlock(encoder, tlv::nfd::NFibEntries,
- m_nFibEntries);
- total_len += prependNonNegativeIntegerBlock(encoder, tlv::nfd::NNameTreeEntries,
- m_nNameTreeEntries);
- total_len += prependNonNegativeIntegerBlock(encoder, tlv::nfd::CurrentTimestamp,
- time::toUnixTimestamp(m_currentTimestamp).count());
- total_len += prependNonNegativeIntegerBlock(encoder, tlv::nfd::StartTimestamp,
- time::toUnixTimestamp(m_startTimestamp).count());
- total_len += prependNonNegativeIntegerBlock(encoder, tlv::nfd::NfdVersion,
- m_nfdVersion);
-
- return total_len;
-}
-
-inline void
-Status::wireDecode(const Block& payload)
-{
- 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_nOutInterests = 0;
- m_nInDatas = 0;
- m_nOutDatas = 0;
-
- if (payload.type() != Tlv::Content) {
- throw Error("Requested decoding of Status Payload, but block is not Content");
- }
- payload.parse();
-
- Block::element_const_iterator val;
-
- val = payload.find(tlv::nfd::NfdVersion);
- if (val != payload.elements_end()) {
- m_nfdVersion = static_cast<int>(readNonNegativeInteger(*val));
- }
-
- val = payload.find(tlv::nfd::StartTimestamp);
- if (val != payload.elements_end()) {
- m_startTimestamp = time::fromUnixTimestamp(time::milliseconds(readNonNegativeInteger(*val)));
- }
-
- val = payload.find(tlv::nfd::CurrentTimestamp);
- if (val != payload.elements_end()) {
- m_currentTimestamp = time::fromUnixTimestamp(time::milliseconds(readNonNegativeInteger(*val)));
- }
-
- val = payload.find(tlv::nfd::NNameTreeEntries);
- if (val != payload.elements_end()) {
- m_nNameTreeEntries = static_cast<size_t>(readNonNegativeInteger(*val));
- }
-
- val = payload.find(tlv::nfd::NFibEntries);
- if (val != payload.elements_end()) {
- m_nFibEntries = static_cast<size_t>(readNonNegativeInteger(*val));
- }
-
- val = payload.find(tlv::nfd::NPitEntries);
- if (val != payload.elements_end()) {
- m_nPitEntries = static_cast<size_t>(readNonNegativeInteger(*val));
- }
-
- val = payload.find(tlv::nfd::NMeasurementsEntries);
- if (val != payload.elements_end()) {
- m_nMeasurementsEntries = static_cast<size_t>(readNonNegativeInteger(*val));
- }
-
- val = payload.find(tlv::nfd::NCsEntries);
- if (val != payload.elements_end()) {
- m_nCsEntries = static_cast<size_t>(readNonNegativeInteger(*val));
- }
-
- val = payload.find(tlv::nfd::NInInterests);
- if (val != payload.elements_end()) {
- m_nInInterests = static_cast<int>(readNonNegativeInteger(*val));
- }
-
- val = payload.find(tlv::nfd::NOutInterests);
- if (val != payload.elements_end()) {
- m_nOutInterests = static_cast<int>(readNonNegativeInteger(*val));
- }
-
- val = payload.find(tlv::nfd::NInDatas);
- if (val != payload.elements_end()) {
- m_nInDatas = static_cast<int>(readNonNegativeInteger(*val));
- }
-
- val = payload.find(tlv::nfd::NOutDatas);
- if (val != payload.elements_end()) {
- m_nOutDatas = static_cast<int>(readNonNegativeInteger(*val));
- }
-}
+/** \deprecated use ForwarderStatus instead
+ */
+typedef ForwarderStatus Status;
} // namespace nfd
} // namespace ndn