refactor: cleanup and sync
* Fix Jenkins scripts and sync with ndn-cxx
* Sync waf-tools
* Remove ChronoSync submodule
* Remove commented/dead code and includes
* Use ScopedEventId and ScopedRegisteredPrefixHandle
* Set setCanBePrefix to true explicitly everywhere
* Fix macOS build, add GHA CI
* Use NDN_THROW for throwing errors
* Other smaller fixes
Change-Id: I615e0e239511b97101852e1d7c620a2071a18ff8
diff --git a/src/nfd-connection-checker.cpp b/src/nfd-connection-checker.cpp
index eda7197..e349b92 100644
--- a/src/nfd-connection-checker.cpp
+++ b/src/nfd-connection-checker.cpp
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil -*- */
/*
- * Copyright (c) 2013, Regents of the University of California
+ * Copyright (c) 2020, Regents of the University of California
*
* BSD license, See the LICENSE file for more information
*
@@ -9,10 +9,6 @@
#include "nfd-connection-checker.hpp"
-#ifndef Q_MOC_RUN
-
-#endif
-
namespace chronochat {
static const int CONNECTION_RETRY_TIMER = 2;
@@ -38,7 +34,9 @@
m_nfdConnected = true;
}
try {
- m_face->expressInterest(Interest("/localhost/nfd/status"),
+ Interest interest("/localhost/nfd/status");
+ interest.setCanBePrefix(true);
+ m_face->expressInterest(interest,
[&] (const Interest& interest, const Data& data) {
m_face->shutdown();
},
@@ -46,7 +44,7 @@
[] (const Interest& interest) {});
m_face->processEvents(time::milliseconds::zero(), true);
}
- catch (std::runtime_error& e) {
+ catch (const std::runtime_error& e) {
{
std::lock_guard<std::mutex>lock(m_nfdMutex);
m_nfdConnected = false;
@@ -73,5 +71,4 @@
#if WAF
#include "nfd-connection-checker.moc"
-// #include "nfd-connection-checker.cpp.moc"
#endif