commit ecb9f97cb0daa9c4d7c40b9336173f13c7121358
author Alexander Afanasyev <alexander.afanasyev@ucla.edu> Wed Aug 19 23:05:27 2015 -0700
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Fri Aug 21 17:47:34 2015 -0700
tree 786659a7de76fd99a26f3983c5894ac137e0ccc1
parent 578f42a79426d93ea180caa03a27d04eb84cb8b5

[ndnSIM] security: Avoid use of io_service::dispatch, use Scheduler instead

Scheduler is fully redirected to native NS-3 scheduler and is safe to use.
Use of `io_service` directly can have an undefined behavior within ndnSIM.

Change-Id: I379e7033b772d3b43a80549110a57950124aafc1

src/security/certificate-cache-ttl.cpp

diff --git a/src/security/certificate-cache-ttl.cpp b/src/security/certificate-cache-ttl.cpp
index 2ab13c9..616fe36 100644
--- a/src/security/certificate-cache-ttl.cpp
+++ b/src/security/certificate-cache-ttl.cpp
@@ -28,8 +28,7 @@
 CertificateCacheTtl::CertificateCacheTtl(boost::asio::io_service& io,
                                          const time::seconds& defaultTtl/* = time::seconds(3600)*/)
   : m_defaultTtl(defaultTtl)
-  , m_io(io)
-  , m_scheduler(m_io)
+  , m_scheduler(io)
 {
 }
 
@@ -40,7 +39,7 @@
 void
 CertificateCacheTtl::insertCertificate(shared_ptr<const IdentityCertificate> certificate)
 {
-  m_io.dispatch([this, certificate] { this->insert(certificate); });
+  m_scheduler.scheduleEvent(time::seconds(0), [this, certificate] { this->insert(certificate); });
 }
 
 shared_ptr<const IdentityCertificate>
@@ -56,7 +55,7 @@
 void
 CertificateCacheTtl::reset()
 {
-  m_io.dispatch([this] { this->removeAll(); });
+  m_scheduler.scheduleEvent(time::seconds(0), [this] { this->removeAll(); });
 }
 
 size_t

src/security/certificate-cache-ttl.hpp

diff --git a/src/security/certificate-cache-ttl.hpp b/src/security/certificate-cache-ttl.hpp
index 55cbc5a..8721a1d 100644
--- a/src/security/certificate-cache-ttl.hpp
+++ b/src/security/certificate-cache-ttl.hpp
@@ -73,7 +73,6 @@
 
   time::seconds m_defaultTtl;
   Cache m_cache;
-  boost::asio::io_service& m_io;
   Scheduler m_scheduler;
 };