encoding: Fixing Block (and as a result Name) encoding bugs
As of this commit, all non-const operations on Block will call resetWire
to remove all references to the wire, so it will be recreated next time
"encode" method is called. Also, all getter methods now have only const
versions and non-const access to the internal data structure is
prohibited.
Change-Id: If4b485dd62541d9d4d168a44490068e4deff56c1
diff --git a/src/management/ndnd-forwarding-entry.hpp b/src/management/ndnd-forwarding-entry.hpp
index 0a02c7e..5cd81ab 100644
--- a/src/management/ndnd-forwarding-entry.hpp
+++ b/src/management/ndnd-forwarding-entry.hpp
@@ -154,36 +154,36 @@
// FreshnessPeriod?
// Action
- Block::element_iterator val = wire_.find(Tlv::FaceManagement::Action);
- if (val != wire_.getAll().end())
+ Block::element_const_iterator val = wire_.find(Tlv::FaceManagement::Action);
+ if (val != wire_.elements_end())
{
action_ = std::string(reinterpret_cast<const char*>(val->value()), val->value_size());
}
// Name
val = wire_.find(Tlv::Name);
- if (val != wire_.getAll().end())
+ if (val != wire_.elements_end())
{
prefix_.wireDecode(*val);
}
// FaceID
val = wire_.find(Tlv::FaceManagement::FaceID);
- if (val != wire_.getAll().end())
+ if (val != wire_.elements_end())
{
faceId_ = readNonNegativeInteger(*val);
}
// ForwardingFlags
val = wire_.find(Tlv::FaceManagement::ForwardingFlags);
- if (val != wire_.getAll().end())
+ if (val != wire_.elements_end())
{
forwardingFlags_.wireDecode(*val);
}
// FreshnessPeriod
val = wire_.find(Tlv::FreshnessPeriod);
- if (val != wire_.getAll().end())
+ if (val != wire_.elements_end())
{
freshnessPeriod_ = readNonNegativeInteger(*val);
}