From ff6be81929037da3bb46d2ee8bbe91165ccf1131 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrien=20B=C3=A9raud?= <adrien.beraud@savoirfairelinux.com>
Date: Thu, 23 May 2019 10:39:35 -0400
Subject: [PATCH] peer discovery: add default port
---
include/opendht/peer_discovery.h | 5 +++--
src/dhtrunner.cpp | 3 +--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/include/opendht/peer_discovery.h b/include/opendht/peer_discovery.h
index 7f17acdb..7aa7c3b6 100644
--- a/include/opendht/peer_discovery.h
+++ b/include/opendht/peer_discovery.h
@@ -31,9 +31,10 @@ namespace dht {
class OPENDHT_PUBLIC PeerDiscovery
{
public:
-
+ static constexpr in_port_t DEFAULT_PORT = 8888;
using ServiceDiscoveredCallback = std::function<void(msgpack::object&&, SockAddr&&)>;
- PeerDiscovery(in_port_t port);
+
+ PeerDiscovery(in_port_t port = DEFAULT_PORT);
~PeerDiscovery();
/**
diff --git a/src/dhtrunner.cpp b/src/dhtrunner.cpp
index d7527389..c22501ca 100644
--- a/src/dhtrunner.cpp
+++ b/src/dhtrunner.cpp
@@ -38,7 +38,6 @@ namespace dht {
constexpr std::chrono::seconds DhtRunner::BOOTSTRAP_PERIOD;
static constexpr size_t RX_QUEUE_MAX_SIZE = 1024 * 16;
static constexpr std::chrono::milliseconds RX_QUEUE_MAX_DELAY(500);
-static constexpr in_port_t PEER_DISCOVERY_PORT = 8888;
static const std::string PEER_DISCOVERY_DHT_SERVICE = "dht";
struct DhtRunner::Listener {
@@ -157,7 +156,7 @@ DhtRunner::run(const SockAddr& local4, const SockAddr& local6, const DhtRunner::
if (config.peer_discovery or config.peer_publish) {
peerDiscovery_ = context.peerDiscovery ?
std::move(context.peerDiscovery) :
- std::make_shared<PeerDiscovery>(PEER_DISCOVERY_PORT);
+ std::make_shared<PeerDiscovery>();
}
auto netId = config.dht_config.node_config.network;
--
GitLab