commit 72c3e040edfa400e0f777d30cc082d106ae6eeba
author Junxiao Shi <git@mail1.yoursunny.com> Tue Apr 08 15:02:37 2014 -0700
committer Junxiao Shi <git@mail1.yoursunny.com> Wed Apr 09 23:04:00 2014 -0700
tree 9571deb7c89f7bf4cc8f9b99d7ad4d73e43a9f84
parent edae353eae13ff94c2d780489b36b832cced2212

mgmt: fix InternalFace::processInterest crash when Interest is gone

Interest may be satisfied by Notification and be removed from PIT
between sendInterest and processInterest.

refs #1452

Change-Id: I0c3e05c34f0d8607d96dcfd156a3e87c1ecb26f2

tests/mgmt/fib-manager.cpp

diff --git a/tests/mgmt/fib-manager.cpp b/tests/mgmt/fib-manager.cpp
index f2d059a..0e2e8c0 100644
--- a/tests/mgmt/fib-manager.cpp
+++ b/tests/mgmt/fib-manager.cpp
@@ -239,13 +239,13 @@
 {
   shared_ptr<InternalFace> face = getInternalFace();
 
-  Interest command("/localhost/nfd/fib");
+  shared_ptr<Interest> command = makeInterest("/localhost/nfd/fib");
 
   face->onReceiveData +=
     bind(&FibManagerFixture::validateControlResponse, this,  _1,
-         command.getName(), 400, "Malformed command");
+         command->getName(), 400, "Malformed command");
 
-  face->sendInterest(command);
+  face->sendInterest(*command);
   g_io.run_one();
 
   BOOST_REQUIRE(didCallbackFire());

tests/mgmt/internal-face.cpp

diff --git a/tests/mgmt/internal-face.cpp b/tests/mgmt/internal-face.cpp
index 6bd63d1..595f05f 100644
--- a/tests/mgmt/internal-face.cpp
+++ b/tests/mgmt/internal-face.cpp
@@ -134,8 +134,8 @@
   // we hit the end of the std::map
 
   Name commandName("/localhost/nfd/fib/end");
-  Interest command(commandName);
-  face->sendInterest(command);
+  shared_ptr<Interest> command = makeInterest(commandName);
+  face->sendInterest(*command);
   g_io.run_one();
 
   BOOST_REQUIRE(didOnInterestFire());
@@ -157,8 +157,8 @@
   // we hit the beginning of the std::map
 
   Name commandName("/localhost/nfd");
-  Interest command(commandName);
-  face->sendInterest(command);
+  shared_ptr<Interest> command = makeInterest(commandName);
+  face->sendInterest(*command);
   g_io.run_one();
 
   BOOST_REQUIRE(didNoOnInterestFire() == false);
@@ -186,8 +186,8 @@
   // /localhost/nfd/fib
 
   Name commandName("/localhost/nfd/fib");
-  Interest command(commandName);
-  face->sendInterest(command);
+  shared_ptr<Interest> command = makeInterest(commandName);
+  face->sendInterest(*command);
   g_io.run_one();
 
   BOOST_REQUIRE(didOnInterestFire());
@@ -212,14 +212,24 @@
   // an Interest filter
 
   Name commandName("/localhost/nfd/fib/previous");
-  Interest command(commandName);
-  face->sendInterest(command);
+  shared_ptr<Interest> command = makeInterest(commandName);
+  face->sendInterest(*command);
   g_io.run_one();
 
   BOOST_REQUIRE(didOnInterestFire());
   BOOST_REQUIRE(didNoOnInterestFire() == false);
 }
 
+BOOST_AUTO_TEST_CASE(InterestGone)
+{
+  shared_ptr<InternalFace> face = make_shared<InternalFace>();
+  shared_ptr<Interest> interest = makeInterest("ndn:/localhost/nfd/gone");
+  face->sendInterest(*interest);
+
+  interest.reset();
+  BOOST_CHECK_NO_THROW(g_io.poll());
+}
+
 BOOST_AUTO_TEST_SUITE_END()
 
 } // namespace tests