From 6b94663b2455e212009a544ae23bb6a8c55407f8 Mon Sep 17 00:00:00 2001
From: Luca Muscariello <lumuscar@cisco.com>
Date: Thu, 9 Jun 2022 21:34:09 +0200
Subject: refactor(lib, hicn-light, vpp, hiperf): HICN-723  - move infra data
 structure into the shared lib  - new packet cache using double hashing and
 lookup on prefix suffix  - testing updates  - authenticated requests using
 interest manifests
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Mauro Sardara <msardara@cisco.com>
Co-authored-by: Jordan Augé <jordan.auge+fdio@cisco.com>
Co-authored-by: Michele Papalini <micpapal@cisco.com>
Co-authored-by: Olivier Roques <oroques+fdio@cisco.com>
Co-authored-by: Enrico Loparco <eloparco@cisco.com>

Change-Id: Iaddebfe6aa5279ea8553433b0f519578f6b9ccd9
Signed-off-by: Luca Muscariello <muscariello@ieee.org>
---
 libtransport/src/utils/epoll_event_reactor.h | 2 +-
 libtransport/src/utils/fd_deadline_timer.h   | 4 ++--
 libtransport/src/utils/suffix_strategy.h     | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'libtransport/src/utils')

diff --git a/libtransport/src/utils/epoll_event_reactor.h b/libtransport/src/utils/epoll_event_reactor.h
index 8e7681c20..32d99c837 100644
--- a/libtransport/src/utils/epoll_event_reactor.h
+++ b/libtransport/src/utils/epoll_event_reactor.h
@@ -49,7 +49,7 @@ class EpollEventReactor : public EventReactor {
     if (it == event_callback_map_.end()) {
       {
         utils::SpinLock::Acquire locked(event_callback_map_lock_);
-        event_callback_map_[fd] = std::forward<EventHandler &&>(callback);
+        event_callback_map_[fd] = std::forward<EventHandler>(callback);
       }
 
       ret = addFileDescriptor(fd, events);
diff --git a/libtransport/src/utils/fd_deadline_timer.h b/libtransport/src/utils/fd_deadline_timer.h
index e15cd4d2a..cf0cde112 100644
--- a/libtransport/src/utils/fd_deadline_timer.h
+++ b/libtransport/src/utils/fd_deadline_timer.h
@@ -57,8 +57,8 @@ class FdDeadlineTimer : public DeadlineTimer<FdDeadlineTimer> {
 
     reactor_.addFileDescriptor(
         timer_fd_, events,
-        [callback = std::forward<WaitHandler &&>(callback)](
-            const Event &event) -> int {
+        [callback =
+             std::forward<WaitHandler>(callback)](const Event &event) -> int {
           uint64_t s = 0;
           std::error_code ec;
 
diff --git a/libtransport/src/utils/suffix_strategy.h b/libtransport/src/utils/suffix_strategy.h
index 96eaed662..4b3ddbc74 100644
--- a/libtransport/src/utils/suffix_strategy.h
+++ b/libtransport/src/utils/suffix_strategy.h
@@ -36,11 +36,11 @@ enum class NextSuffixStrategy : uint8_t {
 class SuffixStrategy {
  public:
   static constexpr uint32_t MAX_SUFFIX = std::numeric_limits<uint32_t>::max();
-  static constexpr uint8_t MAX_MANIFEST_CAPACITY =
+  static constexpr uint8_t MANIFEST_MAX_CAPACITY =
       std::numeric_limits<uint8_t>::max();
 
   SuffixStrategy(NextSuffixStrategy strategy, uint32_t offset = 0,
-                 uint32_t manifest_capacity = MAX_MANIFEST_CAPACITY)
+                 uint32_t manifest_capacity = MANIFEST_MAX_CAPACITY)
       : suffix_stragegy_(strategy),
         next_suffix_(offset),
         manifest_capacity_(manifest_capacity),
@@ -130,7 +130,7 @@ class SuffixStrategyFactory {
  public:
   static std::unique_ptr<SuffixStrategy> getSuffixStrategy(
       NextSuffixStrategy strategy, uint32_t start_offset = 0,
-      uint32_t manifest_capacity = SuffixStrategy::MAX_MANIFEST_CAPACITY) {
+      uint32_t manifest_capacity = SuffixStrategy::MANIFEST_MAX_CAPACITY) {
     switch (strategy) {
       case NextSuffixStrategy::INCREMENTAL:
         return std::make_unique<IncrementalSuffixStrategy>(start_offset);
-- 
cgit 1.2.3-korg