chunks+poke+ping: use PendingInterestHandle and RegisteredPrefixHandle
refs #4316, #3919
Change-Id: Ia95362067a9024964cf67543c76375144b8a2782
diff --git a/tools/peek/ndnpoke/ndnpoke.cpp b/tools/peek/ndnpoke/ndnpoke.cpp
index 1bda0de..40ec247 100644
--- a/tools/peek/ndnpoke/ndnpoke.cpp
+++ b/tools/peek/ndnpoke/ndnpoke.cpp
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/*
- * Copyright (c) 2014-2018, Regents of the University of California,
+ * Copyright (c) 2014-2019, Regents of the University of California,
* Arizona Board of Regents,
* Colorado State University,
* University Pierre & Marie Curie, Sorbonne University,
@@ -93,7 +93,7 @@
std::cerr << "Data exceeded maximum packet size" << std::endl;
}
- m_face.unsetInterestFilter(m_registeredPrefix);
+ m_registeredPrefix.cancel();
}
void
diff --git a/tools/peek/ndnpoke/ndnpoke.hpp b/tools/peek/ndnpoke/ndnpoke.hpp
index f297f9d..fdad5bb 100644
--- a/tools/peek/ndnpoke/ndnpoke.hpp
+++ b/tools/peek/ndnpoke/ndnpoke.hpp
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/*
- * Copyright (c) 2014-2018, Regents of the University of California,
+ * Copyright (c) 2014-2019, Regents of the University of California,
* Arizona Board of Regents,
* Colorado State University,
* University Pierre & Marie Curie, Sorbonne University,
@@ -75,7 +75,7 @@
std::istream& m_inStream;
const PokeOptions& m_options;
- const RegisteredPrefixId* m_registeredPrefix;
+ RegisteredPrefixHandle m_registeredPrefix;
bool m_wasDataSent;
};