From 6d7704c1b497341fd6dd3c27e3f64d0db062ccc2 Mon Sep 17 00:00:00 2001
From: Mauro Sardara <msardara@cisco.com>
Date: Mon, 4 Feb 2019 11:06:18 +0100
Subject: [HICN-11] Rework on transport protocols improving components
 modularity

Change-Id: I6683ec5b494238dc93591c103d25275e89b9f267
Signed-off-by: Mauro Sardara <msardara@cisco.com>
---
 libtransport/src/hicn/transport/protocols/rtc.h | 28 +++++++++++++++----------
 1 file changed, 17 insertions(+), 11 deletions(-)

(limited to 'libtransport/src/hicn/transport/protocols/rtc.h')

diff --git a/libtransport/src/hicn/transport/protocols/rtc.h b/libtransport/src/hicn/transport/protocols/rtc.h
index 61590fc8e..58c143988 100644
--- a/libtransport/src/hicn/transport/protocols/rtc.h
+++ b/libtransport/src/hicn/transport/protocols/rtc.h
@@ -20,6 +20,7 @@
 #include <unordered_map>
 
 #include <hicn/transport/protocols/protocol.h>
+#include <hicn/transport/protocols/reassembly.h>
 #include <hicn/transport/protocols/rtc_data_path.h>
 
 // algorithm state
@@ -86,23 +87,23 @@ struct sentInterest {
   uint8_t retransmissions;
 };
 
-class RTCTransportProtocol : public TransportProtocol {
+class RTCTransportProtocol : public TransportProtocol, public Reassembly {
  public:
-  RTCTransportProtocol(interface::BaseSocket *icnet_socket);
+  RTCTransportProtocol(interface::ConsumerSocket *icnet_socket);
 
   ~RTCTransportProtocol();
 
-  void start(utils::SharableVector<uint8_t> &content_buffer);
+  int start() override;
 
-  void stop();
+  void stop() override;
 
-  void resume();
+  void resume() override;
 
   void onRTCPPacket(uint8_t *packet, size_t len);
 
  private:
   // algo functions
-  void reset();
+  void reset() override;
   void checkRound();
 
   // CC functions
@@ -117,13 +118,18 @@ class RTCTransportProtocol : public TransportProtocol {
 
   // packet functions
   void sendInterest();
-  void scheduleNextInterest();
+  void scheduleNextInterests() override;
   void scheduleAppNackRtx(std::vector<uint32_t> &nacks);
-  void onTimeout(Interest::Ptr &&interest);
+  void onTimeout(Interest::Ptr &&interest) override;
   void onNack(const ContentObject &content_object);
   void onContentObject(Interest::Ptr &&interest,
-                       ContentObject::Ptr &&content_object);
-  void returnContentToUser(const ContentObject &content_object);
+                       ContentObject::Ptr &&content_object) override;
+  void returnContentToApplication(const ContentObject &content_object);
+
+  TRANSPORT_ALWAYS_INLINE virtual void reassemble(
+      ContentObject::Ptr &&content_object) override {
+    returnContentToApplication(*content_object);
+  }
 
   // RTCP functions
   uint32_t hICN2RTP(uint32_t hicn_seq);
@@ -161,7 +167,7 @@ class RTCTransportProtocol : public TransportProtocol {
                           // application for pakets for which we already got a
                           // past NACK by the producer these packet are too old,
                           // they will never be retrived
-  std::shared_ptr<utils::SharableVector<uint8_t>> content_buffer_;
+
   uint32_t modMask_;
 
   // stats
-- 
cgit 1.2.3-korg