src: Fixing Fib refreshing
Change-Id: I14501dc1102cb68e75f31c0e2ea1b4600c0d5bcf
diff --git a/src/hello-protocol.cpp b/src/hello-protocol.cpp
index 0e6f09d..05d121b 100644
--- a/src/hello-protocol.cpp
+++ b/src/hello-protocol.cpp
@@ -223,6 +223,7 @@
faceUri, linkCost, timeout);
m_nlsr.getFib().registerPrefix(broadcastKeyPrefix,
faceUri, linkCost, timeout);
+ m_nlsr.setStrategies();
}
void
diff --git a/src/nlsr.cpp b/src/nlsr.cpp
index 9e8ae6d..2285d85 100644
--- a/src/nlsr.cpp
+++ b/src/nlsr.cpp
@@ -81,15 +81,9 @@
std::string strategy("ndn:/localhost/nfd/strategy/broadcast");
ndn::Name broadcastKeyPrefix = DEFAULT_BROADCAST_PREFIX;
broadcastKeyPrefix.append("KEYS");
- std::list<Adjacent>& adjacents = m_adjacencyList.getAdjList();
- for (std::list<Adjacent>::iterator it = adjacents.begin();
- it != adjacents.end(); it++) {
- m_fib.setStrategy((*it).getName(), strategy);
- }
-
- m_fib.setStrategy(m_confParam.getChronosyncPrefix(), strategy);
- m_fib.setStrategy(m_confParam.getLsaPrefix(), strategy);
- m_fib.setStrategy(broadcastKeyPrefix, strategy);
+ m_fib.setStrategy(m_confParam.getLsaPrefix(), strategy, 0);
+ m_fib.setStrategy(broadcastKeyPrefix, strategy, 0);
+ m_fib.setStrategy(m_confParam.getChronosyncPrefix(), strategy, 0);
}
void
diff --git a/src/nlsr.hpp b/src/nlsr.hpp
index c3b4795..fe1ef6c 100644
--- a/src/nlsr.hpp
+++ b/src/nlsr.hpp
@@ -325,10 +325,10 @@
void
destroyFaces();
-private:
void
setStrategies();
+private:
void
registerKeyPrefix();
diff --git a/src/route/fib.cpp b/src/route/fib.cpp
index 48af899..2f7914a 100644
--- a/src/route/fib.cpp
+++ b/src/route/fib.cpp
@@ -36,6 +36,8 @@
INIT_LOGGER("Fib");
+const uint64_t Fib::GRACE_PERIOD = 10;
+
using namespace std;
using namespace ndn;
@@ -72,21 +74,22 @@
m_table.end(),
bind(&fibEntryNameCompare, _1, name));
if (it != m_table.end()) {
- if (it->getSeqNo() == feSeqNum) {
- _LOG_DEBUG("Refreshing the FIB entry. Name: " << name);
- for (std::list<NextHop>::iterator nhit =
- (*it).getNexthopList().getNextHops().begin();
+ cancelScheduledExpiringEvent((*it).getExpiringEventId());
+ _LOG_DEBUG("Refreshing the FIB entry. Name: " << name);
+ for (std::list<NextHop>::iterator nhit =
+ (*it).getNexthopList().getNextHops().begin();
nhit != (*it).getNexthopList().getNextHops().end(); nhit++) {
- // add entry to NDN-FIB
+ // add entry to NDN-FIB
+ if (isPrefixUpdatable(it->getName())) {
registerPrefix(it->getName(), nhit->getConnectingFaceUri(),
- std::ceil(nhit->getRouteCost()), m_refreshTime);
+ std::ceil(nhit->getRouteCost()), (m_refreshTime + GRACE_PERIOD));
}
- // increase sequence number and schedule refresh again
- it->setSeqNo(feSeqNum + 1);
- it->setExpiringEventId(scheduleEntryRefreshing(it->getName() ,
- it->getSeqNo(),
- ndn::time::seconds(m_refreshTime)));
}
+ // increase sequence number and schedule refresh again
+ it->setSeqNo(feSeqNum + 1);
+ it->setExpiringEventId(scheduleEntryRefreshing(it->getName() ,
+ it->getSeqNo(),
+ ndn::time::seconds(m_refreshTime)));
}
}
@@ -102,16 +105,9 @@
(*it).getNexthopList().getNextHops().begin();
nhit != (*it).getNexthopList().getNextHops().end(); nhit++) {
//remove entry from NDN-FIB
- if (!m_nlsr.getAdjacencyList().isNeighbor(it->getName())) {
+ if (isPrefixUpdatable(it->getName())) {
unregisterPrefix(it->getName(), nhit->getConnectingFaceUri());
}
- else
- {
- if (m_nlsr.getAdjacencyList().getAdjacent(it->getName()).getConnectingFaceUri() !=
- nhit->getConnectingFaceUri()) {
- unregisterPrefix(it->getName(), nhit->getConnectingFaceUri());
- }
- }
}
_LOG_DEBUG("Cancelling Scheduled event. Name: " << name);
cancelScheduledExpiringEvent((*it).getExpiringEventId());
@@ -139,8 +135,10 @@
for (int i = startFace; i < endFace && nhit != nhl.end(); ++nhit, i++) {
newEntry.getNexthopList().addNextHop((*nhit));
//Add entry to NDN-FIB
- registerPrefix(name, nhit->getConnectingFaceUri(),
- std::ceil(nhit->getRouteCost()), m_refreshTime);
+ if (isPrefixUpdatable(name)) {
+ registerPrefix(name, nhit->getConnectingFaceUri(),
+ std::ceil(nhit->getRouteCost()), (m_refreshTime + GRACE_PERIOD));
+ }
}
newEntry.getNexthopList().sort();
ndn::time::system_clock::TimePoint expirationTimePoint = ndn::time::system_clock::now();
@@ -160,8 +158,10 @@
std::list<NextHop> nhl = nextHopList.getNextHops();
std::list<NextHop>::iterator nhit = nhl.begin();
// Add first Entry to NDN-FIB
- registerPrefix(name, nhit->getConnectingFaceUri(),
- std::ceil(nhit->getRouteCost()), m_refreshTime);
+ if (isPrefixUpdatable(name)) {
+ registerPrefix(name, nhit->getConnectingFaceUri(),
+ std::ceil(nhit->getRouteCost()), (m_refreshTime + GRACE_PERIOD));
+ }
removeHop(it->getNexthopList(), nhit->getConnectingFaceUri(), name);
it->getNexthopList().reset();
it->getNexthopList().addNextHop((*nhit));
@@ -170,15 +170,15 @@
for (int i = startFace; i < endFace && nhit != nhl.end(); ++nhit, i++) {
it->getNexthopList().addNextHop((*nhit));
//Add Entry to NDN_FIB
- registerPrefix(name, nhit->getConnectingFaceUri(),
- std::ceil(nhit->getRouteCost()), m_refreshTime);
+ if (isPrefixUpdatable(name)) {
+ registerPrefix(name, nhit->getConnectingFaceUri(),
+ std::ceil(nhit->getRouteCost()), (m_refreshTime + GRACE_PERIOD));
+ }
}
}
ndn::time::system_clock::TimePoint expirationTimePoint = ndn::time::system_clock::now();
expirationTimePoint = expirationTimePoint + ndn::time::seconds(m_refreshTime);
it->setExpirationTimePoint(expirationTimePoint);
- _LOG_DEBUG("Cancelling Scheduled event. Name: " << name);
- cancelScheduledExpiringEvent(it->getExpiringEventId());
it->setSeqNo(it->getSeqNo() + 1);
(*it).setExpiringEventId(scheduleEntryRefreshing(it->getName() ,
it->getSeqNo(),
@@ -201,18 +201,10 @@
_LOG_DEBUG("Cancelling Scheduled event. Name: " << it->getName());
cancelScheduledExpiringEvent((*it).getExpiringEventId());
for (std::list<NextHop>::iterator nhit =
- (*it).getNexthopList().getNextHops().begin();
+ (*it).getNexthopList().getNextHops().begin();
nhit != (*it).getNexthopList().getNextHops().end(); nhit++) {
//Remove entry from NDN-FIB
- if (!m_nlsr.getAdjacencyList().isNeighbor(it->getName())) {
- unregisterPrefix(it->getName(), nhit->getConnectingFaceUri());
- }
- else {
- if (m_nlsr.getAdjacencyList().getAdjacent(it->getName()).getConnectingFaceUri() !=
- nhit->getConnectingFaceUri()) {
- unregisterPrefix(it->getName(), nhit->getConnectingFaceUri());
- }
- }
+ unregisterPrefix(it->getName(), nhit->getConnectingFaceUri());
}
}
if (m_table.size() > 0) {
@@ -234,6 +226,15 @@
return endFace;
}
+bool
+Fib::isPrefixUpdatable(const ndn::Name& name) {
+ if (!m_nlsr.getAdjacencyList().isNeighbor(name)) {
+ return true;
+ }
+
+ return false;
+}
+
void
Fib::removeHop(NexthopList& nl, const std::string& doNotRemoveHopFaceUri,
const ndn::Name& name)
@@ -242,15 +243,9 @@
it != nl.getNextHops().end(); ++it) {
if (it->getConnectingFaceUri() != doNotRemoveHopFaceUri) {
//Remove FIB Entry from NDN-FIB
- if (!m_nlsr.getAdjacencyList().isNeighbor(name)) {
+ if (isPrefixUpdatable(name)) {
unregisterPrefix(name, it->getConnectingFaceUri());
}
- else {
- if (m_nlsr.getAdjacencyList().getAdjacent(name).getConnectingFaceUri() !=
- it->getConnectingFaceUri()) {
- unregisterPrefix(name, it->getConnectingFaceUri());
- }
- }
}
}
}
@@ -370,7 +365,7 @@
}
void
-Fib::setStrategy(const ndn::Name& name, const std::string& strategy)
+Fib::setStrategy(const ndn::Name& name, const std::string& strategy, uint32_t count)
{
ndn::nfd::ControlParameters parameters;
parameters
@@ -378,9 +373,11 @@
.setStrategy(strategy);
m_controller.start<ndn::nfd::StrategyChoiceSetCommand>(parameters,
- bind(&Fib::onSuccess, this, _1,
+ bind(&Fib::onSetStrategySuccess, this, _1,
"Successfully set strategy choice"),
- bind(&Fib::onFailure, this, _1, _2,
+ bind(&Fib::onSetStrategyFailure, this, _1, _2,
+ parameters,
+ count,
"Failed to set strategy choice"));
}
@@ -407,6 +404,27 @@
}
void
+Fib::onSetStrategySuccess(const ndn::nfd::ControlParameters& commandSuccessResult,
+ const std::string& message)
+{
+ _LOG_DEBUG(message << ": " << commandSuccessResult.getStrategy() << " "
+ << "for name: " << commandSuccessResult.getName());
+}
+
+void
+Fib::onSetStrategyFailure(uint32_t code, const std::string& error,
+ const ndn::nfd::ControlParameters& parameters,
+ uint32_t count,
+ const std::string& message)
+{
+ _LOG_DEBUG(message << ": " << parameters.getStrategy() << " "
+ << "for name: " << parameters.getName());
+ if (count < 3) {
+ setStrategy(parameters.getName(), parameters.getStrategy().toUri(),count+1);
+ }
+}
+
+void
Fib::writeLog()
{
_LOG_DEBUG("-------------------FIB-----------------------------");
diff --git a/src/route/fib.hpp b/src/route/fib.hpp
index ecc5030..6a23772 100644
--- a/src/route/fib.hpp
+++ b/src/route/fib.hpp
@@ -70,6 +70,9 @@
}
private:
+ bool
+ isPrefixUpdatable(const ndn::Name& name);
+
void
removeHop(NexthopList& nl, const std::string& doNotRemoveHopFaceUri,
const ndn::Name& name);
@@ -100,7 +103,7 @@
const CommandFailCallback& onFailure);
void
- setStrategy(const ndn::Name& name, const std::string& strategy);
+ setStrategy(const ndn::Name& name, const std::string& strategy, uint32_t count);
void
writeLog();
@@ -145,12 +148,24 @@
void
onFailure(uint32_t code, const std::string& error, const std::string& message);
+ void
+ onSetStrategySuccess(const ndn::nfd::ControlParameters& commandSuccessResult,
+ const std::string& message);
+
+ void
+ onSetStrategyFailure(uint32_t code, const std::string& error,
+ const ndn::nfd::ControlParameters& parameters,
+ uint32_t count,
+ const std::string& message);
+
private:
Nlsr& m_nlsr;
std::list<FibEntry> m_table;
int32_t m_refreshTime;
ndn::nfd::Controller m_controller;
FaceMap m_faceMap;
+
+ static const uint64_t GRACE_PERIOD;
};
}//namespace nlsr