commit 12dfbadc2443281f91cf5ba940b230cc2a630f02
author Alexander Afanasyev <alexander.afanasyev@ucla.edu> Tue Feb 11 14:42:46 2014 -0800
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Tue Feb 11 14:43:31 2014 -0800
tree 5a31787d93586222072230897cae79af6acc672d
parent 17bc3012bba11a07e9f3bda042e2216be338a636

face: Fixing small bug: after unregistering prefix, close transport if
there are no outstanding interests and prefix table is empty

Change-Id: Ie1a121fb34dfdeb10258e1ac46a8be1c9b7cdca9

src/face.cpp

diff --git a/src/face.cpp b/src/face.cpp
index 7e62fe4..fc064f1 100644
--- a/src/face.cpp
+++ b/src/face.cpp
@@ -167,13 +167,27 @@
   if (i != registeredPrefixTable_.end())
     {
       m_fwController->selfDeregisterPrefix((*i)->getPrefix(),
-                                           bind(&RegisteredPrefixTable::erase, &registeredPrefixTable_, i),
+                                           bind(&Face::finalizeUnsertInterestFilter, this, i),
                                            Controller::FailCallback());
     }
 
   // there cannot be two registered prefixes with the same id. if there are, then something is broken
 }
 
+void
+Face::finalizeUnsertInterestFilter(RegisteredPrefixTable::iterator item)
+{
+  registeredPrefixTable_.erase(item);
+
+  if (!pitTimeoutCheckTimerActive_ && registeredPrefixTable_.empty())
+    {
+      transport_->close();
+      if (!ioServiceWork_) {
+        processEventsTimeoutTimer_->cancel();
+      }
+    }
+}
+
 void 
 Face::processEvents(Milliseconds timeout/* = 0 */, bool keepThread/* = false*/)
 {

src/face.hpp

diff --git a/src/face.hpp b/src/face.hpp
index e312016..42f4fd1 100644
--- a/src/face.hpp
+++ b/src/face.hpp
@@ -209,6 +209,9 @@
 
   void
   asyncUnsetInterestFilter(const RegisteredPrefixId *registeredPrefixId);
+
+  void
+  finalizeUnsertInterestFilter(RegisteredPrefixTable::iterator item);
   
   void 
   onReceiveElement(const Block &wire);