From ab38321508d886f0acd535f0f5f07a3d44e29591 Mon Sep 17 00:00:00 2001
From: "Enrico Loparco (eloparco)" <eloparco@cisco.com>
Date: Wed, 14 Sep 2022 08:58:55 +0000
Subject: feat(hicn-ping): allow usage of random prefixes/suffixes in hicn-ping

Ref: HICN-783

Signed-off-by: Enrico Loparco (eloparco) <eloparco@cisco.com>
Change-Id: I41c804dd639ee15aee9619732f55e39a3baf1385
---
 apps/ping/src/ping_server.cc | 90 +++++++++++++++++++++-----------------------
 1 file changed, 43 insertions(+), 47 deletions(-)

(limited to 'apps/ping/src/ping_server.cc')

diff --git a/apps/ping/src/ping_server.cc b/apps/ping/src/ping_server.cc
index 876efd133..b91b2c612 100644
--- a/apps/ping/src/ping_server.cc
+++ b/apps/ping/src/ping_server.cc
@@ -40,6 +40,38 @@ using CryptoSuite = auth::CryptoSuite;
 class CallbackContainer {
   const std::size_t log2_content_object_buffer_size = 12;
 
+ private:
+  std::shared_ptr<ContentObject> createContentObject(const Name &name,
+                                                     uint32_t lifetime,
+                                                     const Interest &interest) {
+    auto &content_object = content_objects_[content_objects_index_++ & mask_];
+
+    content_object->setName(name);
+    content_object->setLifetime(lifetime);
+    content_object->setLocator(interest.getLocator());
+    content_object->setSrcPort(interest.getDstPort());
+    content_object->setDstPort(interest.getSrcPort());
+    content_object->setTTL(ttl_);
+
+    if (verbose_) {
+      std::cout << ">>> send object " << content_object->getName()
+                << " src port: " << content_object->getSrcPort()
+                << " dst port: " << content_object->getDstPort()
+                << " TTL: " << (int)content_object->getTTL() << std::endl;
+    } else if (!quiet_) {
+      std::cout << ">>> send object " << content_object->getName() << std::endl;
+    }
+
+    if (dump_) {
+      std::cout << "----- object dump -----" << std::endl;
+      content_object->dump();
+      std::cout << "-----------------------" << std::endl;
+    }
+
+    if (sign_ && signer_) signer_->signPacket(content_object.get());
+    return content_object;
+  }
+
  public:
   CallbackContainer(const Name &prefix, uint32_t object_size, bool verbose,
                     bool dump, bool quiet, uint8_t ttl, auth::Signer *signer,
@@ -109,58 +141,22 @@ class CallbackContainer {
       std::cout << "-------------------------" << std::endl;
     }
 
-    uint32_t *suffix = interest.firstSuffix();
-    uint32_t n_suffixes_in_manifest = interest.numberOfSuffixes();
-    hicn_uword *request_bitmap = interest.getRequestBitmap();
     if (!interest.isValid()) throw std::runtime_error("Bad interest format");
-
     Name name = interest.getName();
-    uint32_t pos = 0;  // Position of current suffix in manifest
-    do {
-      // If suffix can be processed, i.e. no manifest with bitmap excluding it
-      if (!interest.hasManifest() ||
-          bitmap_is_set_no_check(request_bitmap, pos)) {
-        auto &content_object =
-            content_objects_[content_objects_index_++ & mask_];
-
-        content_object->setName(interest.getName());
-        content_object->setLifetime(lifetime);
-        content_object->setLocator(interest.getLocator());
-        content_object->setSrcPort(interest.getDstPort());
-        content_object->setDstPort(interest.getSrcPort());
-        content_object->setTTL(ttl_);
-
-        if (verbose_) {
-          std::cout << ">>> send object " << content_object->getName()
-                    << " src port: " << content_object->getSrcPort()
-                    << " dst port: " << content_object->getDstPort()
-                    << " TTL: " << (int)content_object->getTTL() << std::endl;
-        } else if (!quiet_) {
-          std::cout << ">>> send object " << content_object->getName()
-                    << std::endl;
-        }
-
-        if (dump_) {
-          std::cout << "----- object dump -----" << std::endl;
-          content_object->dump();
-          std::cout << "-----------------------" << std::endl;
-        }
-
-        if (sign_ && signer_) {
-          signer_->signPacket(content_object.get());
-        }
-
-        p.produce(*content_object);
-      }
 
-      if (interest.hasManifest()) {
-        uint32_t seq = *suffix;
-        suffix++;
+    if (!interest.hasManifest()) {  // Single interest
+      auto content_object = createContentObject(name, lifetime, interest);
+      p.produce(*content_object);
+    } else {  // Interest manifest
+      uint32_t _, *suffix = NULL;
+      interest_manifest_foreach_suffix(interest.getIntManifestHeader(), suffix,
+                                       _) {
+        name.setSuffix(*suffix);
 
-        Name name = interest.getName();
-        interest.setName(name.setSuffix(seq));
+        auto content_object = createContentObject(name, lifetime, interest);
+        p.produce(*content_object);
       }
-    } while (pos++ < n_suffixes_in_manifest);
+    }
 
     if (!quiet_) std::cout << std::endl;
   }
-- 
cgit 1.2.3-korg