fw: Add nack propagation to ASF

This change implements the Best Route nack propagation algorithim to ASF. Currently, this is not provided by ASF and can impact the ability for consumers to retransmit packets. Refs #5311 Change-Id: I45b643979c8726402b89028f07eaedd54c11b4c0
named-data · Feb 2, 2024 · 9acba9c · 9acba9c
1 parent f56cf63
commit 9acba9c
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 3 deletions.
diff --git a/daemon/fw/asf-strategy.cpp b/daemon/fw/asf-strategy.cpp
@@ -34,6 +34,7 @@ NFD_REGISTER_STRATEGY(AsfStrategy);
 
 AsfStrategy::AsfStrategy(Forwarder& forwarder, const Name& name)
   : Strategy(forwarder)
+  , ProcessNackTraits(this)
   , m_measurements(getMeasurements())
   , m_probing(m_measurements)
 {
@@ -167,6 +168,7 @@ AsfStrategy::afterReceiveNack(const lp::Nack& nack, const FaceEndpoint& ingress,
 {
   NFD_LOG_NACK_FROM(nack, ingress, "");
   onTimeoutOrNack(pitEntry->getName(), ingress.face.getId(), true);
+  this->processNack(nack, ingress.face, pitEntry);
 }
 
 pit::OutRecord*

diff --git a/daemon/fw/asf-strategy.hpp b/daemon/fw/asf-strategy.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2014-2022,  Regents of the University of California,
+ * Copyright (c) 2014-2024,  Regents of the University of California,
  *                           Arizona Board of Regents,
  *                           Colorado State University,
  *                           University Pierre & Marie Curie, Sorbonne University,
@@ -29,6 +29,7 @@
 #include "strategy.hpp"
 #include "asf-measurements.hpp"
 #include "asf-probing-module.hpp"
+#include "process-nack-traits.hpp"
 #include "retx-suppression-exponential.hpp"
 
 namespace nfd::fw {
@@ -42,7 +43,7 @@ namespace asf {
  *      with a Smart Forwarding Plane in NDN", NDN Technical Report NDN-0042, 2016.
  *      https://named-data.net/publications/techreports/ndn-0042-1-asf/
  */
-class AsfStrategy : public Strategy
+class AsfStrategy : public Strategy, public ProcessNackTraits<AsfStrategy>
 {
 public:
   explicit
@@ -91,6 +92,8 @@ class AsfStrategy : public Strategy
   std::unique_ptr<RetxSuppressionExponential> m_retxSuppression;
   ProbingModule m_probing;
   size_t m_nMaxTimeouts = 3;
+
+  friend ProcessNackTraits<AsfStrategy>;
 };
 
 } // namespace asf

diff --git a/tests/daemon/fw/strategy-nack-return.t.cpp b/tests/daemon/fw/strategy-nack-return.t.cpp
@@ -28,6 +28,7 @@
  */
 
 // Strategies implementing recommended Nack processing procedure, sorted alphabetically.
+#include "fw/asf-strategy.hpp"
 #include "fw/best-route-strategy.hpp"
 #include "fw/random-strategy.hpp"
 
@@ -84,6 +85,7 @@ BOOST_AUTO_TEST_SUITE(Fw)
 BOOST_AUTO_TEST_SUITE(TestStrategyNackReturn)
 
 using Strategies = boost::mp11::mp_list<
+  AsfStrategy,
   BestRouteStrategy,
   RandomStrategy
 >;

diff --git a/tests/daemon/fw/strategy-scope-control.t.cpp b/tests/daemon/fw/strategy-scope-control.t.cpp
@@ -95,7 +95,7 @@ struct Test
 
 using Tests = boost::mp11::mp_list<
   Test<AccessStrategy, false, false, true>,
-  Test<AsfStrategy, true, false, true>,
+  Test<AsfStrategy, true, true, true>,
   Test<BestRouteStrategy, true, true, true>,
   Test<MulticastStrategy, false, false, false>,
   Test<RandomStrategy, true, true, true>