1 files changed, 27 insertions, 35 deletions

diff --git a/libtransport/src/protocols/raaqm.h b/libtransport/src/protocols/raaqm.h
index fce4194d4..a7ef23b68 100644
--- a/libtransport/src/protocols/raaqm.h
+++ b/libtransport/src/protocols/raaqm.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-2019 Cisco and/or its affiliates.
+ * Copyright (c) 2021 Cisco and/or its affiliates.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at:
@@ -18,11 +18,12 @@
 #include <hicn/transport/utils/chrono_typedefs.h>
 #include <protocols/byte_stream_reassembly.h>
 #include <protocols/congestion_window_protocol.h>
-#include <protocols/protocol.h>
 #include <protocols/raaqm_data_path.h>
 #include <protocols/rate_estimation.h>
+#include <protocols/transport_protocol.h>
 
 #include <queue>
+#include <random>
 #include <vector>
 
 namespace transport {
@@ -32,18 +33,15 @@ namespace protocol {
 class RaaqmTransportProtocol : public TransportProtocol,
                                public CWindowProtocol {
  public:
-  RaaqmTransportProtocol(implementation::ConsumerSocket *icnet_socket);
+  RaaqmTransportProtocol(implementation::ConsumerSocket *icn_socket);
 
   ~RaaqmTransportProtocol();
 
-  int start() override;
-
-  void resume() override;
+  using TransportProtocol::start;
+  using TransportProtocol::stop;
 
   void reset() override;
 
-  virtual bool verifyKeyPackets() override;
-
  protected:
   static constexpr uint32_t buffer_size =
       1 << interface::default_values::log_2_default_buffer_size;
@@ -58,52 +56,43 @@ class RaaqmTransportProtocol : public TransportProtocol,
                                      const ContentObject &content_object);
   virtual void afterDataUnsatisfied(uint64_t segment);
 
-  virtual void updateStats(uint32_t suffix, uint64_t rtt,
-                           utils::TimePoint &now);
+  virtual void updateStats(uint32_t suffix,
+                           const utils::SteadyTime::Microseconds &rtt,
+                           utils::SteadyTime::TimePoint &now);
 
  private:
   void init();
 
-  void onContentObject(Interest::Ptr &&i, ContentObject::Ptr &&c) override;
-
-  void onContentSegment(Interest::Ptr &&interest,
-                        ContentObject::Ptr &&content_object);
-
-  void onPacketDropped(Interest::Ptr &&interest,
-                       ContentObject::Ptr &&content_object) override;
-
+  void onContentObjectReceived(Interest &i, ContentObject &c,
+                               std::error_code &ec) override;
+  void onPacketDropped(Interest &interest, ContentObject &content_object,
+                       const std::error_code &reason) override;
   void onReassemblyFailed(std::uint32_t missing_segment) override;
-
-  void onTimeout(Interest::Ptr &&i) override;
-
+  void onInterestTimeout(Interest::Ptr &i, const Name &n) override;
   virtual void scheduleNextInterests() override;
+  void sendInterest(const Name &interest_name,
+                    std::array<uint32_t, MAX_AGGREGATED_INTEREST>
+                        *additional_suffixes = nullptr,
+                    uint32_t len = 0) override;
 
-  bool sendInterest(std::uint64_t next_suffix);
-
-  void sendInterest(Interest::Ptr &&interest);
-
-  void onContentReassembled(std::error_code ec) override;
-
+  void onContentReassembled(const std::error_code &ec) override;
   void updateRtt(uint64_t segment);
-
   void RAAQM();
-
   void updatePathTable(const ContentObject &content_object);
-
   void checkDropProbability();
-
   void checkForStalePaths();
-
   void printRtt();
 
+  auto shared_from_this() { return utils::shared_from(this); }
+
  protected:
   // Congestion window management
   double current_window_size_;
   // Protocol management
   uint64_t interests_in_flight_;
   std::array<std::uint32_t, buffer_size> interest_retransmissions_;
-  std::array<utils::TimePoint, buffer_size> interest_timepoints_;
-  std::queue<Interest::Ptr> interest_to_retransmit_;
+  std::array<utils::SteadyTime::TimePoint, buffer_size> interest_timepoints_;
+  std::queue<uint32_t> interest_to_retransmit_;
 
  private:
   /**
@@ -117,13 +106,16 @@ class RaaqmTransportProtocol : public TransportProtocol,
   PathTable path_table_;
 
   // TimePoints for statistic
-  utils::TimePoint t0_;
+  utils::SteadyTime::TimePoint t0_;
 
   bool set_interest_filter_;
 
   // for rate-estimation at packet level
   IcnRateEstimator *rate_estimator_;
 
+  // Real distribution
+  std::uniform_real_distribution<> dis_;
+
   // params for autotuning
   bool raaqm_autotune_;
   double default_beta_;