commit 6eabbd72053d867d4a605f470a6b0374c61a64ef
author Yingdi Yu <yuyingdi@gmail.com> Fri Dec 27 08:44:12 2013 +0800
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Fri May 09 15:16:10 2014 -0700
tree 25f9ebe1bd13e13f9b5120406d665ba429769923
parent 76dd800d3d173135be65f0979a0b025ba78d562d

Fixing some bugs causing segment faults, and update ChronoSync. Now it should work, but we need to run more tests to see if there are some other bugs.

Change-Id: Ib06603cb7262a7f38abe42be94da685f18eab65d

src/contactpanel.h

diff --git a/src/contactpanel.h b/src/contactpanel.h
index 1c2c9fc..615a836 100644
--- a/src/contactpanel.h
+++ b/src/contactpanel.h
@@ -32,6 +32,9 @@
 #include "contact-manager.h"
 #include "chronos-invitation.h"
 #include "panel-policy-manager.h"
+#include <boost/thread/locks.hpp>
+#include <boost/thread/recursive_mutex.hpp>
+#include <boost/thread/thread.hpp>
 #endif
 
 
@@ -49,6 +52,16 @@
   ~ContactPanel();
 
 private:
+  
+  void 
+  startFace();
+
+  void
+  shutdownFace();
+
+  void
+  eventLoop();
+  
   void 
   connectToDaemon();
 
@@ -275,6 +288,11 @@
   ndn::ptr_lib::shared_ptr<ndn::IdentityManager> m_identityManager;
   ndn::ptr_lib::shared_ptr<ndn::Transport> m_transport;
   ndn::ptr_lib::shared_ptr<ndn::Face> m_face;
+
+  boost::recursive_mutex m_mutex;
+  boost::thread m_thread;
+  bool m_running;
+
   uint64_t m_invitationListenerId;
 
   ndn::Name m_defaultIdentity;