lsdb: Fetch LSA from the face the notification about LSAs came from
Change-Id: Iadb7a22bcc8b2d7801787e5d88b37eec4eafc974
diff --git a/tests/communication/test-sync-logic-handler.cpp b/tests/communication/test-sync-logic-handler.cpp
index b493290..b7836c2 100644
--- a/tests/communication/test-sync-logic-handler.cpp
+++ b/tests/communication/test-sync-logic-handler.cpp
@@ -52,7 +52,7 @@
face.sentInterests.clear();
std::vector<psync::MissingDataInfo> updates;
- updates.push_back({ndn::Name(prefix), 0, seqNo});
+ updates.push_back({ndn::Name(prefix), 0, seqNo, 0});
sync.m_syncLogic.onPSyncUpdate(updates);
this->advanceClocks(ndn::time::milliseconds(1), 10);
@@ -86,7 +86,7 @@
std::string updateName = this->updateNamePrefix + boost::lexical_cast<std::string>(lsaType);
ndn::util::signal::ScopedConnection connection = this->sync.onNewLsa->connect(
- [&] (const auto& routerName, uint64_t sequenceNumber, const auto& originRouter) {
+ [&] (const auto& routerName, uint64_t sequenceNumber, const auto& originRouter, uint64_t incomingFaceId) {
BOOST_CHECK_EQUAL(ndn::Name{updateName}, routerName);
BOOST_CHECK_EQUAL(sequenceNumber, syncSeqNo);
++nCallbacks;
@@ -113,7 +113,7 @@
std::string updateName = this->updateNamePrefix + boost::lexical_cast<std::string>(lsaType);
ndn::util::signal::ScopedConnection connection = this->sync.onNewLsa->connect(
- [&] (const auto& routerName, uint64_t sequenceNumber, const auto& originRouter) {
+ [&] (const auto& routerName, uint64_t sequenceNumber, const auto& originRouter, uint64_t incomingFaceId) {
BOOST_CHECK_EQUAL(ndn::Name{updateName}, routerName);
BOOST_CHECK_EQUAL(sequenceNumber, syncSeqNo);
++nCallbacks;
@@ -140,7 +140,7 @@
std::string updateName = this->updateNamePrefix + boost::lexical_cast<std::string>(lsaType);
ndn::util::signal::ScopedConnection connection = this->sync.onNewLsa->connect(
- [&] (const auto& routerName, uint64_t sequenceNumber, const auto& originRouter) {
+ [&] (const auto& routerName, uint64_t sequenceNumber, const auto& originRouter, uint64_t incomingFaceId) {
BOOST_CHECK_EQUAL(ndn::Name{updateName}, routerName);
BOOST_CHECK_EQUAL(sequenceNumber, syncSeqNo);
++nCallbacks;
@@ -169,7 +169,7 @@
.append(boost::lexical_cast<std::string>(lsaType));
ndn::util::signal::ScopedConnection connection = this->sync.onNewLsa->connect(
- [&] (const auto& routerName, uint64_t sequenceNumber, const auto& originRouter) {
+ [&] (const auto& routerName, uint64_t sequenceNumber, const auto& originRouter, uint64_t incomingFaceId) {
BOOST_FAIL("Updates for self should not be emitted!");
});
@@ -193,7 +193,7 @@
updateName.append(this->conf.getRouterName()).append(boost::lexical_cast<std::string>(lsaType));
ndn::util::signal::ScopedConnection connection = this->sync.onNewLsa->connect(
- [&] (const auto& routerName, uint64_t sequenceNumber, const auto& originRouter) {
+ [&] (const auto& routerName, uint64_t sequenceNumber, const auto& originRouter, uint64_t incomingFaceId) {
BOOST_FAIL("Malformed updates should not be emitted!");
});
@@ -211,14 +211,14 @@
BOOST_AUTO_TEST_CASE(LsaNotNew)
{
auto testLsaAlwaysFalse = [] (const ndn::Name& routerName, const Lsa::Type& lsaType,
- const uint64_t& sequenceNumber) {
+ const uint64_t& sequenceNumber, uint64_t incomingFaceId) {
return false;
};
const uint64_t sequenceNumber = 1;
SyncLogicHandler sync{this->face, testLsaAlwaysFalse, this->conf};
ndn::util::signal::ScopedConnection connection = sync.onNewLsa->connect(
- [&] (const auto& routerName, uint64_t sequenceNumber, const auto& originRouter) {
+ [&] (const auto& routerName, uint64_t sequenceNumber, const auto& originRouter, uint64_t incomingFaceId) {
BOOST_FAIL("An update for an LSA with non-new sequence number should not emit!");
});
diff --git a/tests/communication/test-sync-protocol-adapter.cpp b/tests/communication/test-sync-protocol-adapter.cpp
index 74d9e23..919f5e8 100644
--- a/tests/communication/test-sync-protocol-adapter.cpp
+++ b/tests/communication/test-sync-protocol-adapter.cpp
@@ -53,7 +53,7 @@
userPrefixes[i],
syncInterestLifetime,
[i, this] (const ndn::Name& updateName,
- uint64_t highSeq) {
+ uint64_t highSeq, uint64_t incomingFaceId) {
prefixToSeq[i].emplace(updateName, highSeq);
});
}
diff --git a/tests/security/test-certificate-store.cpp b/tests/security/test-certificate-store.cpp
index 46c9524..0db13a8 100644
--- a/tests/security/test-certificate-store.cpp
+++ b/tests/security/test-certificate-store.cpp
@@ -141,7 +141,7 @@
BOOST_CHECK(certStore.find(certKey) != nullptr);
BOOST_CHECK(certStore.find(certificate.getName()) != nullptr);
- lsdb.expressInterest(certKey, 0);
+ lsdb.expressInterest(certKey, 0, 0);
advanceClocks(10_ms);
checkForInterest(certKey);
@@ -211,7 +211,7 @@
lsaInterestName.append(boost::lexical_cast<std::string>(Lsa::Type::NAME));
lsaInterestName.appendNumber(nlsr.m_lsdb.m_sequencingManager.getNameLsaSeq() + 1);
- lsdb.expressInterest(lsaInterestName, 0);
+ lsdb.expressInterest(lsaInterestName, 0, 0);
advanceClocks(10_ms);
checkForInterest(lsaInterestName);
diff --git a/tests/test-lsa-segment-storage.cpp b/tests/test-lsa-segment-storage.cpp
index 592ea90..dabfe9d 100644
--- a/tests/test-lsa-segment-storage.cpp
+++ b/tests/test-lsa-segment-storage.cpp
@@ -1,26 +1,22 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/*
- * Copyright (c) 2014-2022, Regents of the University of California,
- * Arizona Board of Regents,
- * Colorado State University,
- * University Pierre & Marie Curie, Sorbonne University,
- * Washington University in St. Louis,
- * Beijing Institute of Technology,
- * The University of Memphis.
+ * Copyright (c) 2014-2022, The University of Memphis,
+ * Regents of the University of California,
+ * Arizona Board of Regents.
*
- * This file is part of NFD (Named Data Networking Forwarding Daemon).
- * See AUTHORS.md for complete list of NFD authors and contributors.
+ * This file is part of NLSR (Named-data Link State Routing).
+ * See AUTHORS.md for complete list of NLSR authors and contributors.
*
- * NFD is free software: you can redistribute it and/or modify it under the terms
+ * NLSR is free software: you can redistribute it and/or modify it under the terms
* of the GNU General Public License as published by the Free Software Foundation,
* either version 3 of the License, or (at your option) any later version.
*
- * NFD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * NLSR is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
* without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
* PURPOSE. See the GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License along with
- * NFD, e.g., in COPYING.md file. If not, see <http://www.gnu.org/licenses/>.
+ * NLSR, e.g., in COPYING.md file. If not, see <http://www.gnu.org/licenses/>.
*/
#include "nlsr.hpp"
@@ -107,7 +103,7 @@
ndn::Name lsaInterestName("/ndn/NLSR/LSA/other-site/%C1.Router/other-router/NAME");
lsaInterestName.appendNumber(12);
- lsdb.expressInterest(lsaInterestName, 0);
+ lsdb.expressInterest(lsaInterestName, 0, 0);
advanceClocks(ndn::time::milliseconds(10));
makeLsaContent(lsaInterestName);
@@ -127,7 +123,7 @@
// Remove older LSA from storage upon receiving that of higher sequence
ndn::Name lsaInterestName2("/ndn/NLSR/LSA/other-site/%C1.Router/other-router/NAME");
lsaInterestName2.appendNumber(13);
- lsdb.expressInterest(lsaInterestName2, 0);
+ lsdb.expressInterest(lsaInterestName2, 0, 0);
advanceClocks(ndn::time::milliseconds(10));
makeLsaContent(lsaInterestName2, 1);
diff --git a/tests/test-lsdb.cpp b/tests/test-lsdb.cpp
index f1b46a6..ec2668b 100644
--- a/tests/test-lsdb.cpp
+++ b/tests/test-lsdb.cpp
@@ -147,7 +147,7 @@
ndn::Name oldInterestName = interestName;
oldInterestName.appendNumber(oldSeqNo);
- lsdb.expressInterest(oldInterestName, 0);
+ lsdb.expressInterest(oldInterestName, 0, 0);
advanceClocks(10_ms);
std::vector<ndn::Interest>& interests = face.sentInterests;
@@ -185,7 +185,7 @@
ndn::Name newInterestName = interestName;
newInterestName.appendNumber(newSeqNo);
- lsdb.expressInterest(newInterestName, 0);
+ lsdb.expressInterest(newInterestName, 0, 0);
advanceClocks(10_ms);
BOOST_REQUIRE(interests.size() > 0);
@@ -245,7 +245,7 @@
ndn::Name interestName("/localhop/ndn/nlsr/LSA/site/%C1.Router/this-router/NAME");
interestName.appendNumber(seqNo);
- lsdb2.expressInterest(interestName, 0/*= timeout count*/);
+ lsdb2.expressInterest(interestName, 0/*= timeout count*/, 0);
advanceClocks(ndn::time::milliseconds(200), 20);
diff --git a/tests/test-statistics.cpp b/tests/test-statistics.cpp
index 7822b76..f66fd10 100644
--- a/tests/test-statistics.cpp
+++ b/tests/test-statistics.cpp
@@ -103,7 +103,7 @@
{
size_t sentBefore = collector.getStatistics().get(statsType);
- lsdb.expressInterest(ndn::Name(prefix + lsaType).appendNumber(seqNo), 0,
+ lsdb.expressInterest(ndn::Name(prefix + lsaType).appendNumber(seqNo), 0, 0,
ndn::time::steady_clock::TimePoint::min());
this->advanceClocks(ndn::time::milliseconds(1), 10);