1 files changed, 44 insertions, 85 deletions

diff --git a/libtransport/src/protocols/protocol.h b/libtransport/src/protocols/protocol.h
index 73a0a2c64..a9f929db9 100644
--- a/libtransport/src/protocols/protocol.h
+++ b/libtransport/src/protocols/protocol.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:
@@ -15,100 +15,59 @@
 
 #pragma once
 
-#include <hicn/transport/interfaces/callbacks.h>
-#include <hicn/transport/interfaces/socket_consumer.h>
-#include <hicn/transport/interfaces/statistics.h>
-#include <hicn/transport/utils/object_pool.h>
-#include <implementation/socket.h>
-#include <protocols/data_processing_events.h>
-#include <protocols/indexer.h>
-#include <protocols/packet_manager.h>
-#include <protocols/reassembly.h>
+#include <core/portal.h>
+#include <hicn/transport/errors/runtime_exception.h>
+#include <hicn/transport/utils/noncopyable.h>
 
-#include <atomic>
+#include <random>
 
 namespace transport {
 
 namespace protocol {
 
-using namespace core;
-
-class IndexVerificationManager;
-
-using ReadCallback = interface::ConsumerSocket::ReadCallback;
-
-class TransportProtocolCallback {
-  virtual void onContentObject(const core::Interest &interest,
-                               const core::ContentObject &content_object) = 0;
-  virtual void onTimeout(const core::Interest &interest) = 0;
-};
-
-class TransportProtocol : public implementation::BasePortal::ConsumerCallback,
-                          public PacketManager<Interest>,
-                          public ContentObjectProcessingEventCallback {
-  static constexpr std::size_t interest_pool_size = 4096;
-
-  friend class ManifestIndexManager;
-
+class Protocol : public core::Portal::TransportCallback, utils::NonCopyable {
  public:
-  TransportProtocol(implementation::ConsumerSocket *icn_socket,
-                    Reassembly *reassembly_protocol);
-
-  virtual ~TransportProtocol() = default;
-
-  TRANSPORT_ALWAYS_INLINE bool isRunning() { return is_running_; }
-
-  virtual int start();
-
-  virtual void stop();
-
-  virtual void resume();
-
-  virtual bool verifyKeyPackets() = 0;
-
-  virtual void scheduleNextInterests() = 0;
-
-  // Events generated by the indexing
-  virtual void onContentReassembled(std::error_code ec);
-  virtual void onPacketDropped(
-      Interest::Ptr &&interest,
-      ContentObject::Ptr &&content_object) override = 0;
-  virtual void onReassemblyFailed(std::uint32_t missing_segment) override = 0;
+  virtual void stop() {
+    portal_->getThread().addAndWaitForExecution([this]() {
+      unSetRunning();
+      portal_->unregisterTransportCallback();
+      portal_->clear();
+    });
+  }
+
+  virtual void onInterest(core::Interest &i) {
+    throw errors::RuntimeException("Not implemented");
+  }
+
+  virtual void onContentObject(core::Interest &i, core::ContentObject &c) {
+    throw errors::RuntimeException("Not implemented");
+  }
+
+  virtual void onTimeout(core::Interest::Ptr &i, const core::Name &n) {
+    throw errors::RuntimeException("Not implemented");
+  }
+
+  virtual void onError(const std::error_code &ec) {
+    throw errors::RuntimeException("Not implemented");
+  }
+
+  bool isRunning() { return is_running_; }
+  void setRunning() { is_running_ = true; }
+  void unSetRunning() { is_running_ = false; }
 
  protected:
-  // Consumer Callback
-  virtual void reset() = 0;
-  virtual void onContentObject(Interest::Ptr &&i,
-                               ContentObject::Ptr &&c) override = 0;
-  virtual void onTimeout(Interest::Ptr &&i) override = 0;
-  virtual void onError(std::error_code ec) override {}
+  Protocol() : portal_(nullptr), is_running_(false), gen_(rd_()) {}
+  virtual ~Protocol() {}
 
  protected:
-  implementation::ConsumerSocket *socket_;
-  std::unique_ptr<Reassembly> reassembly_protocol_;
-  std::unique_ptr<IndexManager> index_manager_;
-  std::shared_ptr<implementation::BasePortal> portal_;
-  std::atomic<bool> is_running_;
-  // True if it si the first time we schedule an interest
-  std::atomic<bool> is_first_;
-  interface::TransportStatistics *stats_;
-
-  // Callbacks
-  interface::ConsumerInterestCallback *on_interest_retransmission_;
-  interface::ConsumerInterestCallback *on_interest_output_;
-  interface::ConsumerInterestCallback *on_interest_timeout_;
-  interface::ConsumerInterestCallback *on_interest_satisfied_;
-  interface::ConsumerContentObjectCallback *on_content_object_input_;
-  interface::ConsumerContentObjectVerificationCallback
-      *on_content_object_verification_;
-  interface::ConsumerContentObjectCallback *on_content_object_;
-  interface::ConsumerTimerCallback *stats_summary_;
-  interface::ConsumerContentObjectVerificationFailedCallback
-      *verification_failed_callback_;
-  ReadCallback *on_payload_;
-
-  bool is_async_;
+  std::shared_ptr<core::Portal> portal_;
+  std::atomic_bool is_running_;
+
+  // Random engine
+  std::random_device rd_;
+  std::mt19937 gen_;
 };
 
-}  // end namespace protocol
-}  // end namespace transport
+}  // namespace protocol
+
+}  // namespace transport
\ No newline at end of file