BREAKING: Change Name LSAs to propagate cost which are applied to remote routes
This is a stopgap change to address a lack of functionality in the NDN testbed.
Current restrictions:
-Cost must be set from NFD readvertisement
-Cost is applied after routing calculations but before FIB insertion; lowest cost
nexthop will be chosen but may not be the optimal path given this cost.
Further work will be required to move the application of cost as part of routing
and to make this functionality more easily accessible.
Refs #5349
Change-Id: I914dc5c2d5d3cb6bfa13f5730df0eae66d115c60
diff --git a/src/route/name-prefix-table.cpp b/src/route/name-prefix-table.cpp
index 3ee9132..ea4fc16 100644
--- a/src/route/name-prefix-table.cpp
+++ b/src/route/name-prefix-table.cpp
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/*
- * Copyright (c) 2014-2022, The University of Memphis,
+ * Copyright (c) 2014-2025, The University of Memphis,
* Regents of the University of California,
* Arizona Board of Regents.
*
@@ -62,8 +62,8 @@
void
NamePrefixTable::updateFromLsdb(std::shared_ptr<Lsa> lsa, LsdbUpdate updateType,
- const std::list<ndn::Name>& namesToAdd,
- const std::list<ndn::Name>& namesToRemove)
+ const std::list<nlsr::PrefixInfo>& namesToAdd,
+ const std::list<nlsr::PrefixInfo>& namesToRemove)
{
if (m_ownRouterName == lsa->getOriginRouter()) {
return;
@@ -75,9 +75,10 @@
if (lsa->getType() == Lsa::Type::NAME) {
auto nlsa = std::static_pointer_cast<NameLsa>(lsa);
- for (const auto& name : nlsa->getNpl().getNames()) {
- if (name != m_ownRouterName) {
- addEntry(name, lsa->getOriginRouter());
+ for (const auto &prefix : nlsa->getNpl().getPrefixInfo()) {
+ if (prefix.getName() != m_ownRouterName) {
+ m_nexthopCost[DestNameKey(lsa->getOriginRouter(), prefix.getName())] = prefix.getCost();
+ addEntry(prefix.getName(), lsa->getOriginRouter());
}
}
}
@@ -87,15 +88,17 @@
return;
}
- for (const auto& name : namesToAdd) {
- if (name != m_ownRouterName) {
- addEntry(name, lsa->getOriginRouter());
+ for (const auto &prefix : namesToAdd) {
+ if (prefix.getName() != m_ownRouterName) {
+ m_nexthopCost[DestNameKey(lsa->getOriginRouter(), prefix.getName())] = prefix.getCost();
+ addEntry(prefix.getName(), lsa->getOriginRouter());
}
}
- for (const auto& name : namesToRemove) {
- if (name != m_ownRouterName) {
- removeEntry(name, lsa->getOriginRouter());
+ for (const auto &prefix : namesToRemove) {
+ if (prefix.getName() != m_ownRouterName) {
+ m_nexthopCost.erase(m_nexthopCost.find(DestNameKey(lsa->getOriginRouter(), prefix.getName())));
+ removeEntry(prefix.getName(), lsa->getOriginRouter());
}
}
}
@@ -105,6 +108,7 @@
auto nlsa = std::static_pointer_cast<NameLsa>(lsa);
for (const auto& name : nlsa->getNpl().getNames()) {
if (name != m_ownRouterName) {
+ m_nexthopCost.erase(m_nexthopCost.find(DestNameKey(lsa->getOriginRouter(), name)));
removeEntry(name, lsa->getOriginRouter());
}
}
@@ -112,6 +116,18 @@
}
}
+NexthopList
+NamePrefixTable::adjustNexthopCosts(const NexthopList& nhlist, const ndn::Name& nameToCheck, const ndn::Name& destRouterName)
+{
+ NexthopList new_nhList;
+ for (const auto& nh : nhlist.getNextHops()) {
+ const NextHop newNextHop = NextHop(nh.getConnectingFaceUri(), nh.getRouteCost() +
+ m_nexthopCost[DestNameKey(destRouterName, nameToCheck)]);
+ new_nhList.addNextHop(newNextHop);
+ }
+ return new_nhList;
+}
+
void
NamePrefixTable::addEntry(const ndn::Name& name, const ndn::Name& destRouter)
{
@@ -161,7 +177,7 @@
// If this entry has next hops, we need to inform the FIB
if (npte->getNexthopList().size() > 0) {
NLSR_LOG_TRACE("Updating FIB with next hops for " << npte->getNamePrefix());
- m_fib.update(name, npte->getNexthopList());
+ m_fib.update(name, adjustNexthopCosts(npte->getNexthopList(), name, destRouter));
}
// The routing table may recalculate and add a routing table entry
// with no next hops to replace an existing routing table entry. In
@@ -183,7 +199,7 @@
if ((*nameItr)->getNexthopList().size() > 0) {
NLSR_LOG_TRACE("Updating FIB with next hops for " << (**nameItr));
- m_fib.update(name, (*nameItr)->getNexthopList());
+ m_fib.update(name, adjustNexthopCosts((*nameItr)->getNexthopList(), name, destRouter));
}
else {
NLSR_LOG_TRACE(npte->getNamePrefix() << " has no next hops; removing from FIB");
@@ -251,7 +267,7 @@
NLSR_LOG_TRACE(**nameItr << " has other routing table entries;"
<< " updating FIB with next hops");
(*nameItr)->generateNhlfromRteList();
- m_fib.update(name, (*nameItr)->getNexthopList());
+ m_fib.update(name, adjustNexthopCosts((*nameItr)->getNexthopList(), name, destRouter));
}
}
else {