commit 771a0de40cbf858ad60051a84a5e53bb84f8ce3e
author Junxiao Shi <git@mail1.yoursunny.com> Wed Aug 09 00:03:21 2023 +0000
committer Junxiao Shi <git@mail1.yoursunny.com> Mon Aug 14 10:49:07 2023 +0000
tree 8621dd4382e7da961451814906f9baa29c41e618
parent 907675bd06a7de95d4e9b9c5ee26b724bb523425

tests: change FaceId in test-nlsr and test-fib

DummyClientFace is no longer overwriting FaceId of prefix registration
reply, so that we can use FaceId other than 1.

refs #5011

Change-Id: I50ff0a6ee023ebe5cc78e6d62a45ce375798ad41

tests/route/test-fib.cpp

diff --git a/tests/route/test-fib.cpp b/tests/route/test-fib.cpp
index a902eb7..932b63a 100644
--- a/tests/route/test-fib.cpp
+++ b/tests/route/test-fib.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-2023,  The University of Memphis,
  *                           Regents of the University of California
  *
  * This file is part of NLSR (Named-data Link State Routing).
@@ -39,7 +39,6 @@
     , fib(face, m_scheduler, adjacencies, conf, m_keyChain)
     , interests(face.sentInterests)
   {
-    enableRegistrationReplyWithFaceId();
     advanceClocks(1_s);
 
     Adjacent neighbor1(router1Name, ndn::FaceUri(router1FaceUri), 0, Adjacent::STATUS_ACTIVE, 0, router1FaceId);
@@ -56,36 +55,6 @@
     fib.setEntryRefreshTime(1);
   }
 
-  void
-  enableRegistrationReplyWithFaceId()
-  {
-    face.onSendInterest.connect([this] (const auto& interest) {
-      if (!RIB_COMMAND_PREFIX.isPrefixOf(interest.getName()))
-        return;
-
-      ndn::name::Component verb;
-      ndn::nfd::ControlParameters params;
-      extractRibCommandParameters(interest, verb, params);
-      if (!params.hasFaceId()) {
-        params.setFaceId(1);
-      }
-      params.setOrigin(ndn::nfd::ROUTE_ORIGIN_APP);
-      if (verb == ndn::name::Component("register")) {
-        params.setCost(0);
-      }
-
-      ndn::nfd::ControlResponse resp;
-      resp.setCode(200);
-      resp.setBody(params.wireEncode());
-
-      ndn::Data data(interest.getName());
-      data.setContent(resp.wireEncode());
-      m_keyChain.sign(data, ndn::security::SigningInfo(ndn::security::SigningInfo::SIGNER_TYPE_SHA256));
-
-      face.getIoService().post([this, data] { face.receive(data); });
-    });
-  }
-
   static void
   extractRibCommandParameters(const ndn::Interest& interest,
                               ndn::Name::Component& verb,
@@ -102,7 +71,12 @@
   ndn::Scheduler m_scheduler{m_io};
 
 public:
-  ndn::util::DummyClientFace face{m_io, m_keyChain};
+  ndn::util::DummyClientFace face{m_io, m_keyChain, [] {
+    ndn::util::DummyClientFace::Options opts;
+    opts.enableRegistrationReply = true;
+    opts.registrationReplyFaceId = 128;
+    return opts;
+  } ()};
   ConfParameter conf{face, m_keyChain};
   AdjacencyList& adjacencies;
   Fib fib;