1 files changed, 26 insertions, 35 deletions

diff --git a/libtransport/src/implementation/p2psecure_socket_producer.h b/libtransport/src/implementation/p2psecure_socket_producer.h
index 33339deba..b7c3d1958 100644
--- a/libtransport/src/implementation/p2psecure_socket_producer.h
+++ b/libtransport/src/implementation/p2psecure_socket_producer.h
@@ -15,15 +15,14 @@
 
 #pragma once
 
-#include <hicn/transport/security/identity.h>
-#include <hicn/transport/security/signer.h>
-
+#include <hicn/transport/auth/identity.h>
+#include <hicn/transport/auth/signer.h>
 #include <implementation/socket_producer.h>
-#include <implementation/tls_rtc_socket_producer.h>
+// #include <implementation/tls_rtc_socket_producer.h>
 #include <implementation/tls_socket_producer.h>
+#include <openssl/ssl.h>
 #include <utils/content_store.h>
 
-#include <openssl/ssl.h>
 #include <condition_variable>
 #include <forward_list>
 #include <mutex>
@@ -33,37 +32,40 @@ namespace implementation {
 
 class P2PSecureProducerSocket : public ProducerSocket {
   friend class TLSProducerSocket;
-  friend class TLSRTCProducerSocket;
+  // TODO
+  //   friend class TLSRTCProducerSocket;
 
  public:
   explicit P2PSecureProducerSocket(interface::ProducerSocket *producer_socket);
+
   explicit P2PSecureProducerSocket(
       interface::ProducerSocket *producer_socket, bool rtc,
-      const std::shared_ptr<utils::Identity> &identity);
+      const std::shared_ptr<auth::Identity> &identity);
+
   ~P2PSecureProducerSocket();
 
-  void produce(const uint8_t *buffer, size_t buffer_size) override;
+  uint32_t produceDatagram(const Name &content_name,
+                           std::unique_ptr<utils::MemBuf> &&buffer) override;
 
-  uint32_t produce(Name content_name, const uint8_t *buffer, size_t buffer_size,
-                   bool is_last = true, uint32_t start_offset = 0) override;
+  uint32_t produceStream(const Name &content_name, const uint8_t *buffer,
+                         size_t buffer_size, bool is_last = true,
+                         uint32_t start_offset = 0) override;
 
-  uint32_t produce(Name content_name, std::unique_ptr<utils::MemBuf> &&buffer,
-                   bool is_last = true, uint32_t start_offset = 0) override;
+  uint32_t produceStream(const Name &content_name,
+                         std::unique_ptr<utils::MemBuf> &&buffer,
+                         bool is_last = true,
+                         uint32_t start_offset = 0) override;
 
   void asyncProduce(Name content_name, std::unique_ptr<utils::MemBuf> &&buffer,
                     bool is_last, uint32_t offset,
                     uint32_t **last_segment = nullptr) override;
 
-  void asyncProduce(const Name &suffix, const uint8_t *buf, size_t buffer_size,
-                    bool is_last = true,
-                    uint32_t *start_offset = nullptr) override;
-
   int setSocketOption(int socket_option_key,
                       ProducerInterestCallback socket_option_value) override;
 
   int setSocketOption(
       int socket_option_key,
-      const std::shared_ptr<utils::Signer> &socket_option_value) override;
+      const std::shared_ptr<auth::Signer> &socket_option_value) override;
 
   int setSocketOption(int socket_option_key,
                       uint32_t socket_option_value) override;
@@ -73,9 +75,6 @@ class P2PSecureProducerSocket : public ProducerSocket {
   int setSocketOption(int socket_option_key,
                       Name *socket_option_value) override;
 
-  int setSocketOption(int socket_option_key,
-                      std::list<Prefix> socket_option_value) override;
-
   int setSocketOption(
       int socket_option_key,
       ProducerContentObjectCallback socket_option_value) override;
@@ -84,19 +83,15 @@ class P2PSecureProducerSocket : public ProducerSocket {
                       ProducerContentCallback socket_option_value) override;
 
   int setSocketOption(int socket_option_key,
-                      utils::CryptoHashType socket_option_value) override;
-
-  int setSocketOption(int socket_option_key,
-                      utils::CryptoSuite socket_option_value) override;
+                      auth::CryptoHashType socket_option_value) override;
 
   int setSocketOption(int socket_option_key,
                       const std::string &socket_option_value) override;
 
   using ProducerSocket::getSocketOption;
-  using ProducerSocket::onInterest;
+  //   using ProducerSocket::onInterest;
 
  protected:
-  bool rtc_;
   /* Callback invoked once an interest has been received and its payload
    * decrypted */
   ProducerInterestCallback on_interest_input_decrypted_;
@@ -104,27 +99,23 @@ class P2PSecureProducerSocket : public ProducerSocket {
   ProducerContentCallback on_content_produced_application_;
 
  private:
+  bool rtc_;
   std::mutex mtx_;
-
   /* Condition variable for the wait */
   std::condition_variable cv_;
-
   PARCBuffer *der_cert_;
   PARCBuffer *der_prk_;
   X509 *cert_509_;
   EVP_PKEY *pkey_rsa_;
   std::unordered_map<core::Name, std::unique_ptr<TLSProducerSocket>,
                      core::hash<core::Name>, core::compare2<core::Name>>
-      map_secure_producers;
-  std::unordered_map<core::Name, std::unique_ptr<TLSRTCProducerSocket>,
-                     core::hash<core::Name>, core::compare2<core::Name>>
-      map_secure_rtc_producers;
-  std::list<std::unique_ptr<TLSProducerSocket>> list_secure_producers;
-  std::list<std::unique_ptr<TLSRTCProducerSocket>> list_secure_rtc_producers;
+      map_producers;
+  std::list<std::unique_ptr<TLSProducerSocket>> list_producers;
 
   void onInterestCallback(interface::ProducerSocket &p, Interest &interest);
+
+  void initSessionSocket(std::unique_ptr<TLSProducerSocket> &producer);
 };
 
 }  // namespace implementation
-
 }  // namespace transport