diff --git a/src/ndn-traffic-client.cpp b/src/ndn-traffic-client.cpp index e965a81..b18d051 100644 --- a/src/ndn-traffic-client.cpp +++ b/src/ndn-traffic-client.cpp @@ -33,7 +33,7 @@ #include #include -#include +#include #include #include #include @@ -117,8 +117,7 @@ public: m_signalSet.async_wait([this] (auto&&...) { stop(); }); - boost::asio::deadline_timer timer(m_ioService, - boost::posix_time::millisec(m_interestInterval.count())); + boost::asio::deadline_timer timer(m_io, boost::posix_time::millisec(m_interestInterval.count())); timer.async_wait([this, &timer] (auto&&...) { generateTraffic(timer); }); try { @@ -127,7 +126,7 @@ public: } catch (const std::exception& e) { m_logger.log("ERROR: "s + e.what(), true, true); - m_ioService.stop(); + m_io.stop(); return 1; } } @@ -541,14 +540,14 @@ private: logStatistics(); m_face.shutdown(); - m_ioService.stop(); + m_io.stop(); } private: Logger m_logger{"NdnTrafficClient"}; - boost::asio::io_service m_ioService; - boost::asio::signal_set m_signalSet{m_ioService, SIGINT, SIGTERM}; - ndn::Face m_face{m_ioService}; + boost::asio::io_context m_io; + boost::asio::signal_set m_signalSet{m_io, SIGINT, SIGTERM}; + ndn::Face m_face{m_io}; std::string m_configurationFile; std::string m_timestampFormat; diff --git a/src/ndn-traffic-server.cpp b/src/ndn-traffic-server.cpp index 3556efe..f4c9fea 100644 --- a/src/ndn-traffic-server.cpp +++ b/src/ndn-traffic-server.cpp @@ -33,7 +33,7 @@ #include #include -#include +#include #include #include #include @@ -129,7 +129,7 @@ public: } catch (const std::exception& e) { m_logger.log("ERROR: "s + e.what(), true, true); - m_ioService.stop(); + m_io.stop(); return 1; } } @@ -331,14 +331,14 @@ private: { logStatistics(); m_face.shutdown(); - m_ioService.stop(); + m_io.stop(); } private: Logger m_logger{"NdnTrafficServer"}; - boost::asio::io_service m_ioService; - boost::asio::signal_set m_signalSet{m_ioService, SIGINT, SIGTERM}; - ndn::Face m_face{m_ioService}; + boost::asio::io_context m_io; + boost::asio::signal_set m_signalSet{m_io, SIGINT, SIGTERM}; + ndn::Face m_face{m_io}; ndn::KeyChain m_keyChain; std::string m_configurationFile;