management: avoid CommandInterestGenerator in nfd::Controller
refs #1849
Change-Id: Id416c0e33100312b9877f5e45db6a7a3651df961
diff --git a/src/management/nfd-control-parameters.hpp b/src/management/nfd-control-parameters.hpp
index 0ab0f84..61381cb 100644
--- a/src/management/nfd-control-parameters.hpp
+++ b/src/management/nfd-control-parameters.hpp
@@ -67,9 +67,10 @@
};
/**
- * \ingroup management
- * \brief represents parameters in a ControlCommand request or response
- * \sa http://redmine.named-data.net/projects/nfd/wiki/ControlCommand
+ * @ingroup management
+ * @brief represents parameters in a ControlCommand request or response
+ * @sa http://redmine.named-data.net/projects/nfd/wiki/ControlCommand#ControlParameters
+ * @detail This type is copyable because it's an abstraction of a TLV type.
*/
class ControlParameters
{
@@ -84,17 +85,10 @@
}
};
- ControlParameters()
- : m_hasFields(CONTROL_PARAMETER_UBOUND)
- {
- }
+ ControlParameters();
explicit
- ControlParameters(const Block& block)
- : m_hasFields(CONTROL_PARAMETER_UBOUND)
- {
- wireDecode(block);
- }
+ ControlParameters(const Block& block);
template<bool T>
size_t
@@ -401,184 +395,8 @@
mutable Block m_wire;
};
-
-template<bool T>
-inline size_t
-ControlParameters::wireEncode(EncodingImpl<T>& encoder) const
-{
- size_t totalLength = 0;
-
- if (this->hasExpirationPeriod()) {
- totalLength += prependNonNegativeIntegerBlock(encoder,
- tlv::nfd::ExpirationPeriod, m_expirationPeriod.count());
- }
- if (this->hasStrategy()) {
- totalLength += prependNestedBlock(encoder, tlv::nfd::Strategy, m_strategy);
- }
- if (this->hasFlags()) {
- totalLength += prependNonNegativeIntegerBlock(encoder, tlv::nfd::Flags, m_flags);
- }
- if (this->hasCost()) {
- totalLength += prependNonNegativeIntegerBlock(encoder, tlv::nfd::Cost, m_cost);
- }
- if (this->hasOrigin()) {
- totalLength += prependNonNegativeIntegerBlock(encoder, tlv::nfd::Origin, m_origin);
- }
- if (this->hasLocalControlFeature()) {
- totalLength += prependNonNegativeIntegerBlock(encoder,
- tlv::nfd::LocalControlFeature, m_localControlFeature);
- }
- if (this->hasUri()) {
- size_t valLength = encoder.prependByteArray(
- reinterpret_cast<const uint8_t*>(m_uri.c_str()), m_uri.size());
- totalLength += valLength;
- totalLength += encoder.prependVarNumber(valLength);
- totalLength += encoder.prependVarNumber(tlv::nfd::Uri);
- }
- if (this->hasFaceId()) {
- totalLength += prependNonNegativeIntegerBlock(encoder, tlv::nfd::FaceId, m_faceId);
- }
- if (this->hasName()) {
- totalLength += m_name.wireEncode(encoder);
- }
-
- totalLength += encoder.prependVarNumber(totalLength);
- totalLength += encoder.prependVarNumber(tlv::nfd::ControlParameters);
- return totalLength;
-}
-
-inline const Block&
-ControlParameters::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
-ControlParameters::wireDecode(const Block& block)
-{
- if (block.type() != tlv::nfd::ControlParameters) {
- throw Error("expecting TLV-TYPE ControlParameters");
- }
- m_wire = block;
- m_wire.parse();
- Block::element_const_iterator val;
-
- val = m_wire.find(tlv::Name);
- m_hasFields[CONTROL_PARAMETER_NAME] = val != m_wire.elements_end();
- if (this->hasName()) {
- m_name.wireDecode(*val);
- }
-
- val = m_wire.find(tlv::nfd::FaceId);
- m_hasFields[CONTROL_PARAMETER_FACE_ID] = val != m_wire.elements_end();
- if (this->hasFaceId()) {
- m_faceId = static_cast<uint64_t>(readNonNegativeInteger(*val));
- }
-
- val = m_wire.find(tlv::nfd::Uri);
- m_hasFields[CONTROL_PARAMETER_URI] = val != m_wire.elements_end();
- if (this->hasUri()) {
- m_uri.assign(reinterpret_cast<const char*>(val->value()), val->value_size());
- }
-
- val = m_wire.find(tlv::nfd::LocalControlFeature);
- m_hasFields[CONTROL_PARAMETER_LOCAL_CONTROL_FEATURE] = val != m_wire.elements_end();
- if (this->hasLocalControlFeature()) {
- m_localControlFeature = static_cast<LocalControlFeature>(readNonNegativeInteger(*val));
- }
-
- val = m_wire.find(tlv::nfd::Origin);
- m_hasFields[CONTROL_PARAMETER_ORIGIN] = val != m_wire.elements_end();
- if (this->hasOrigin()) {
- m_origin = static_cast<uint64_t>(readNonNegativeInteger(*val));
- }
-
- val = m_wire.find(tlv::nfd::Cost);
- m_hasFields[CONTROL_PARAMETER_COST] = val != m_wire.elements_end();
- if (this->hasCost()) {
- m_cost = static_cast<uint64_t>(readNonNegativeInteger(*val));
- }
-
- val = m_wire.find(tlv::nfd::Flags);
- m_hasFields[CONTROL_PARAMETER_FLAGS] = val != m_wire.elements_end();
- if (this->hasFlags()) {
- m_flags = static_cast<uint64_t>(readNonNegativeInteger(*val));
- }
-
- val = m_wire.find(tlv::nfd::Strategy);
- m_hasFields[CONTROL_PARAMETER_STRATEGY] = val != m_wire.elements_end();
- if (this->hasStrategy()) {
- val->parse();
- if (val->elements().empty()) {
- throw Error("expecting Strategy/Name");
- }
- else {
- m_strategy.wireDecode(*val->elements_begin());
- }
- }
-
- val = m_wire.find(tlv::nfd::ExpirationPeriod);
- m_hasFields[CONTROL_PARAMETER_EXPIRATION_PERIOD] = val != m_wire.elements_end();
- if (this->hasExpirationPeriod()) {
- m_expirationPeriod = time::milliseconds(readNonNegativeInteger(*val));
- }
-}
-
-inline std::ostream&
-operator<<(std::ostream& os, const ControlParameters& parameters)
-{
- os << "ControlParameters(";
-
- if (parameters.hasName()) {
- os << "Name: " << parameters.getName() << ", ";
- }
-
- if (parameters.hasFaceId()) {
- os << "FaceId: " << parameters.getFaceId() << ", ";
- }
-
- if (parameters.hasUri()) {
- os << "Uri: " << parameters.getUri() << ", ";
- }
-
- if (parameters.hasLocalControlFeature()) {
- os << "LocalControlFeature: " << parameters.getLocalControlFeature() << ", ";
- }
-
- if (parameters.hasOrigin()) {
- os << "Origin: " << parameters.getOrigin() << ", ";
- }
-
- if (parameters.hasCost()) {
- os << "Cost: " << parameters.getCost() << ", ";
- }
-
- if (parameters.hasFlags()) {
- os << "Flags: " << parameters.getFlags() << ", ";
- }
-
- if (parameters.hasStrategy()) {
- os << "Strategy: " << parameters.getStrategy() << ", ";
- }
-
- if (parameters.hasExpirationPeriod()) {
- os << "ExpirationPeriod: " << parameters.getExpirationPeriod() << ", ";
- }
-
- os << ")";
- return os;
-}
-
+std::ostream&
+operator<<(std::ostream& os, const ControlParameters& parameters);
} // namespace nfd
} // namespace ndn