build: == Dependency change == NLSR now depends on ndn-cxx library
Refs: #1535
Change-Id: I4c7c0c3dcfcac6ee91648a46c07e426adbb5bd20
diff --git a/src/communication/data-manager.cpp b/src/communication/data-manager.cpp
index f56dd79..8525ce7 100644
--- a/src/communication/data-manager.cpp
+++ b/src/communication/data-manager.cpp
@@ -1,9 +1,9 @@
#include <iostream>
#include <cstdlib>
-#include <ndn-cpp-dev/security/signature-sha256-with-rsa.hpp>
-#include <ndn-cpp-dev/security/identity-certificate.hpp>
-#include <ndn-cpp-dev/util/io.hpp>
+#include <ndn-cxx/security/signature-sha256-with-rsa.hpp>
+#include <ndn-cxx/security/identity-certificate.hpp>
+#include <ndn-cxx/util/io.hpp>
#include "nlsr.hpp"
#include "data-manager.hpp"
@@ -60,18 +60,20 @@
Tokenizer nt(dataName, "/");
string chkString("info");
string neighbor = nt.getTokenString(0, nt.getTokenPosition(chkString) - 1);
- int oldStatus = m_nlsr.getAdl().getStatusOfNeighbor(neighbor);
- int infoIntTimedOutCount = m_nlsr.getAdl().getTimedOutInterestCount(neighbor);
+ int oldStatus = m_nlsr.getAdjacencyList().getStatusOfNeighbor(neighbor);
+ int infoIntTimedOutCount = m_nlsr.getAdjacencyList().getTimedOutInterestCount(
+ neighbor);
//debugging purpose start
std::cout << "Before Updates: " << std::endl;
std::cout << "Neighbor : " << neighbor << std::endl;
std::cout << "Status: " << oldStatus << std::endl;
std::cout << "Info Interest Timed out: " << infoIntTimedOutCount << std::endl;
//debugging purpose end
- m_nlsr.getAdl().setStatusOfNeighbor(neighbor, 1);
- m_nlsr.getAdl().setTimedOutInterestCount(neighbor, 0);
- int newStatus = m_nlsr.getAdl().getStatusOfNeighbor(neighbor);
- infoIntTimedOutCount = m_nlsr.getAdl().getTimedOutInterestCount(neighbor);
+ m_nlsr.getAdjacencyList().setStatusOfNeighbor(neighbor, 1);
+ m_nlsr.getAdjacencyList().setTimedOutInterestCount(neighbor, 0);
+ int newStatus = m_nlsr.getAdjacencyList().getStatusOfNeighbor(neighbor);
+ infoIntTimedOutCount = m_nlsr.getAdjacencyList().getTimedOutInterestCount(
+ neighbor);
//debugging purpose
std::cout << "After Updates: " << std::endl;
std::cout << "Neighbor : " << neighbor << std::endl;
diff --git a/src/communication/data-manager.hpp b/src/communication/data-manager.hpp
index ece3fca..86c2e42 100644
--- a/src/communication/data-manager.hpp
+++ b/src/communication/data-manager.hpp
@@ -1,9 +1,9 @@
#ifndef NLSR_DM_HPP
#define NLSR_DM_HPP
-#include <ndn-cpp-dev/face.hpp>
-#include <ndn-cpp-dev/security/key-chain.hpp>
-#include <ndn-cpp-dev/util/scheduler.hpp>
+#include <ndn-cxx/face.hpp>
+#include <ndn-cxx/security/key-chain.hpp>
+#include <ndn-cxx/util/scheduler.hpp>
#include "interest-manager.hpp"
diff --git a/src/communication/interest-manager.cpp b/src/communication/interest-manager.cpp
index 070c92b..edcfec7 100644
--- a/src/communication/interest-manager.cpp
+++ b/src/communication/interest-manager.cpp
@@ -2,8 +2,8 @@
#include <cstdlib>
-#include <ndn-cpp-dev/security/identity-certificate.hpp>
-#include <ndn-cpp-dev/util/io.hpp>
+#include <ndn-cxx/security/identity-certificate.hpp>
+#include <ndn-cxx/util/io.hpp>
#include "nlsr.hpp"
#include "interest-manager.hpp"
@@ -47,7 +47,7 @@
InterestManager::processInterestInfo(const string& neighbor,
const ndn::Interest& interest)
{
- if (m_nlsr.getAdl().isNeighbor(neighbor))
+ if (m_nlsr.getAdjacencyList().isNeighbor(neighbor))
{
Data data(ndn::Name(interest.getName()).appendVersion());
data.setFreshnessPeriod(time::seconds(10)); // 10 sec
@@ -56,7 +56,7 @@
m_keyChain.sign(data);
cout << ">> D: " << data << endl;
m_nlsr.getNlsrFace()->put(data);
- int status = m_nlsr.getAdl().getStatusOfNeighbor(neighbor);
+ int status = m_nlsr.getAdjacencyList().getStatusOfNeighbor(neighbor);
if (status == 0)
{
string intName = neighbor + "/" + "info" +
@@ -256,9 +256,10 @@
InterestManager::processInterestTimedOutInfo(const string& neighbor,
const ndn::Interest& interest)
{
- m_nlsr.getAdl().incrementTimedOutInterestCount(neighbor);
- int status = m_nlsr.getAdl().getStatusOfNeighbor(neighbor);
- int infoIntTimedOutCount = m_nlsr.getAdl().getTimedOutInterestCount(neighbor);
+ m_nlsr.getAdjacencyList().incrementTimedOutInterestCount(neighbor);
+ int status = m_nlsr.getAdjacencyList().getStatusOfNeighbor(neighbor);
+ int infoIntTimedOutCount = m_nlsr.getAdjacencyList().getTimedOutInterestCount(
+ neighbor);
std::cout << "Neighbor: " << neighbor << std::endl;
std::cout << "Status: " << status << std::endl;
std::cout << "Info Interest Timed out: " << infoIntTimedOutCount << std::endl;
@@ -272,7 +273,7 @@
else if ((status == 1) &&
(infoIntTimedOutCount == m_nlsr.getConfParameter().getInterestRetryNumber()))
{
- m_nlsr.getAdl().setStatusOfNeighbor(neighbor, 0);
+ m_nlsr.getAdjacencyList().setStatusOfNeighbor(neighbor, 0);
m_nlsr.incrementAdjBuildCount();
if (m_nlsr.getIsBuildAdjLsaSheduled() == 0)
{
@@ -301,7 +302,7 @@
i.setMustBeFresh(true);
m_nlsr.getNlsrFace()->expressInterest(i,
ndn::bind(&DataManager::processContent,
- &m_nlsr.getDm(),
+ &m_nlsr.getDataManager(),
_1, _2, boost::ref(*this)),
ndn::bind(&InterestManager::processInterestTimedOut,
this, _1));
@@ -311,7 +312,7 @@
void
InterestManager::sendScheduledInfoInterest(int seconds)
{
- std::list<Adjacent> adjList = m_nlsr.getAdl().getAdjList();
+ std::list<Adjacent> adjList = m_nlsr.getAdjacencyList().getAdjList();
for (std::list<Adjacent>::iterator it = adjList.begin(); it != adjList.end();
++it)
{
diff --git a/src/communication/interest-manager.hpp b/src/communication/interest-manager.hpp
index 725103d..7fe7655 100644
--- a/src/communication/interest-manager.hpp
+++ b/src/communication/interest-manager.hpp
@@ -1,9 +1,9 @@
#ifndef NLSR_IM_HPP
#define NLSR_IM_HPP
-#include <ndn-cpp-dev/face.hpp>
-#include <ndn-cpp-dev/security/key-chain.hpp>
-#include <ndn-cpp-dev/util/scheduler.hpp>
+#include <ndn-cxx/face.hpp>
+#include <ndn-cxx/security/key-chain.hpp>
+#include <ndn-cxx/util/scheduler.hpp>
namespace nlsr {
diff --git a/src/communication/sync-logic-handler.cpp b/src/communication/sync-logic-handler.cpp
index 16b92bc..51ec319 100644
--- a/src/communication/sync-logic-handler.cpp
+++ b/src/communication/sync-logic-handler.cpp
@@ -81,8 +81,8 @@
pnlsr.getConfParameter().getChronosyncLsaPrefix() +
routerName + "/1/" +
boost::lexical_cast<std::string>(sm.getNameLsaSeq());
- pnlsr.getIm().expressInterest(lsaPrefix, 3,
- pnlsr.getConfParameter().getInterestResendTime());
+ pnlsr.getInterestManager().expressInterest(lsaPrefix, 3,
+ pnlsr.getConfParameter().getInterestResendTime());
}
if (pnlsr.getLsdb().isAdjLsaNew(routerName + "/2", sm.getAdjLsaSeq()))
{
@@ -91,8 +91,8 @@
pnlsr.getConfParameter().getChronosyncLsaPrefix() +
routerName + "/2/" +
boost::lexical_cast<std::string>(sm.getAdjLsaSeq());
- pnlsr.getIm().expressInterest(lsaPrefix, 3,
- pnlsr.getConfParameter().getInterestResendTime());
+ pnlsr.getInterestManager().expressInterest(lsaPrefix, 3,
+ pnlsr.getConfParameter().getInterestResendTime());
}
if (pnlsr.getLsdb().isCoordinateLsaNew(routerName + "/3", sm.getCorLsaSeq()))
{
@@ -101,8 +101,8 @@
pnlsr.getConfParameter().getChronosyncLsaPrefix() +
routerName + "/3/" +
boost::lexical_cast<std::string>(sm.getCorLsaSeq());
- pnlsr.getIm().expressInterest(lsaPrefix, 3,
- pnlsr.getConfParameter().getInterestResendTime());
+ pnlsr.getInterestManager().expressInterest(lsaPrefix, 3,
+ pnlsr.getConfParameter().getInterestResendTime());
}
}
}
diff --git a/src/communication/sync-logic-handler.hpp b/src/communication/sync-logic-handler.hpp
index 05123ff..1896484 100644
--- a/src/communication/sync-logic-handler.hpp
+++ b/src/communication/sync-logic-handler.hpp
@@ -3,10 +3,10 @@
#include <iostream>
-#include <ndn-cpp-dev/face.hpp>
+#include <ndn-cxx/face.hpp>
#include <nsync/sync-socket.h>
-#include <ndn-cpp-dev/security/validator-null.hpp>
-#include <ndn-cpp-dev/util/scheduler.hpp>
+#include <ndn-cxx/security/validator-null.hpp>
+#include <ndn-cxx/util/scheduler.hpp>
#include "sequencing-manager.hpp"