kademlia multiple protocols (#219)

Signed-off-by: turuslan <[email protected]>
libp2p · Oct 12, 2023 · ac2eec9 · ac2eec9
1 parent 28f3bf0
commit ac2eec9
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 13 deletions.
diff --git a/include/libp2p/protocol/kademlia/common.hpp b/include/libp2p/protocol/kademlia/common.hpp
@@ -8,10 +8,9 @@
 
 #include <chrono>
 
+#include <libp2p/basic/scheduler.hpp>
 #include <libp2p/peer/peer_id.hpp>
 #include <libp2p/peer/peer_info.hpp>
-#include <libp2p/peer/protocol.hpp>
-#include <libp2p/basic/scheduler.hpp>
 #include <libp2p/protocol/kademlia/content_id.hpp>
 #include <libp2p/protocol/kademlia/content_value.hpp>
 
@@ -21,7 +20,6 @@ namespace libp2p::protocol::kademlia {
 
   using peer::PeerId;
   using peer::PeerInfo;
-  using peer::ProtocolName;
 
   using Key = ContentId;
   using Value = ContentValue;

diff --git a/include/libp2p/protocol/kademlia/config.hpp b/include/libp2p/protocol/kademlia/config.hpp
@@ -7,6 +7,7 @@
 #define LIBP2P_PROTOCOL_KADEMLIA_CONFIG
 
 #include <libp2p/outcome/outcome.hpp>
+#include <libp2p/peer/stream_protocols.hpp>
 #include <libp2p/protocol/kademlia/common.hpp>
 
 namespace libp2p::protocol::kademlia {
@@ -51,10 +52,10 @@ namespace libp2p::protocol::kademlia {
     Config() = default;
 
     /**
-     * @returns kademlia protocol id
+     * @returns kademlia protocol ids
      * @note Default: "ipfs/kad/1.0"
      */
-    peer::ProtocolName protocolId = "/ipfs/kad/1.0.0";
+    StreamProtocols protocols = {"/ipfs/kad/1.0.0"};
 
     /**
      * True if application is not announce himself

diff --git a/include/libp2p/protocol/kademlia/impl/kademlia_impl.hpp b/include/libp2p/protocol/kademlia/impl/kademlia_impl.hpp
@@ -128,7 +128,6 @@ namespace libp2p::protocol::kademlia {
 
     // --- Secondary ---
 
-    const ProtocolName &protocol_;
     const PeerId self_id_;
 
     // --- Auxiliary ---

diff --git a/src/protocol/kademlia/impl/add_provider_executor.cpp b/src/protocol/kademlia/impl/add_provider_executor.cpp
@@ -138,7 +138,7 @@ namespace libp2p::protocol::kademlia {
           config_.connectionTimeout);
 
       host_->newStream(
-          peer_info, {config_.protocolId},
+          peer_info, config_.protocols,
           [holder](auto &&stream_res) {
             if (holder->first) {
               holder->second.cancel();

diff --git a/src/protocol/kademlia/impl/find_peer_executor.cpp b/src/protocol/kademlia/impl/find_peer_executor.cpp
@@ -148,7 +148,7 @@ namespace libp2p::protocol::kademlia {
           config_.connectionTimeout);
 
       host_->newStream(
-          peer_info, {config_.protocolId},
+          peer_info, config_.protocols,
           [holder](auto &&stream_res) {
             if (holder->first) {
               holder->second.cancel();

diff --git a/src/protocol/kademlia/impl/find_providers_executor.cpp b/src/protocol/kademlia/impl/find_providers_executor.cpp
@@ -157,7 +157,7 @@ namespace libp2p::protocol::kademlia {
           config_.connectionTimeout);
 
       host_->newStream(
-          peer_info, {config_.protocolId},
+          peer_info, config_.protocols,
           [holder](auto &&stream_res) {
             if (holder->first) {
               holder->second.cancel();

diff --git a/src/protocol/kademlia/impl/get_value_executor.cpp b/src/protocol/kademlia/impl/get_value_executor.cpp
@@ -145,7 +145,7 @@ namespace libp2p::protocol::kademlia {
           config_.connectionTimeout);
 
       host_->newStream(
-          peer_info, {config_.protocolId},
+          peer_info, config_.protocols,
           [holder](auto &&stream_res) {
             if (holder->first) {
               holder->second.cancel();

diff --git a/src/protocol/kademlia/impl/kademlia_impl.cpp b/src/protocol/kademlia/impl/kademlia_impl.cpp
@@ -43,7 +43,6 @@ namespace libp2p::protocol::kademlia {
         scheduler_(std::move(scheduler)),
         bus_(std::move(bus)),
         random_generator_(std::move(random_generator)),
-        protocol_(config_.protocolId),
         self_id_(host_->getId()),
         log_("Kademlia", "kademlia") {
     BOOST_ASSERT(host_ != nullptr);
@@ -68,7 +67,7 @@ namespace libp2p::protocol::kademlia {
 
     // handle streams for observed protocol
     host_->setProtocolHandler(
-        {protocol_}, [wp = weak_from_this()](StreamAndProtocol stream) {
+        config_.protocols, [wp = weak_from_this()](StreamAndProtocol stream) {
           if (auto self = wp.lock()) {
             self->handleProtocol(std::move(stream));
           }

diff --git a/src/protocol/kademlia/impl/put_value_executor.cpp b/src/protocol/kademlia/impl/put_value_executor.cpp
@@ -90,7 +90,7 @@ namespace libp2p::protocol::kademlia {
           config_.connectionTimeout);
 
       host_->newStream(
-          peer_info, {config_.protocolId},
+          peer_info, config_.protocols,
           [holder](auto &&stream_res) {
             if (holder->first) {
               holder->second.cancel();