apps+helper+utils: Fixes of consumer and producer apps to work with the new codebase
This commit also replaces boost::tuple with std::tuple in Batches class
Credits for the commit also to Spyros Mastorakis and Alex Afanasyev
diff --git a/model/ndn-app-face.cpp b/model/ndn-app-face.cpp
index 9759771..fc301cb 100644
--- a/model/ndn-app-face.cpp
+++ b/model/ndn-app-face.cpp
@@ -53,6 +53,7 @@
void
AppFace::close()
{
+ this->fail("Close connection");
}
void
diff --git a/model/ndn-net-device-face.cpp b/model/ndn-net-device-face.cpp
index 03d95db..19266b5 100644
--- a/model/ndn-net-device-face.cpp
+++ b/model/ndn-net-device-face.cpp
@@ -60,13 +60,14 @@
NetDeviceFace::~NetDeviceFace()
{
NS_LOG_FUNCTION_NOARGS();
-
- m_node->UnregisterProtocolHandler(MakeCallback(&NetDeviceFace::receiveFromNetDevice, this));
+ close();
}
void
NetDeviceFace::close()
{
+ m_node->UnregisterProtocolHandler(MakeCallback(&NetDeviceFace::receiveFromNetDevice, this));
+ this->fail("Close connection");
}
Ptr<NetDevice>