From dcff71a5576e9d698a37ca371b9b12536449395a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrien=20B=C3=A9raud?= <adrien.beraud@savoirfairelinux.com> Date: Fri, 14 Jun 2019 10:49:25 -0400 Subject: [PATCH] jamiaccount: disable peer discovery by default Change-Id: I533b47960993953a9f0e7ab99aaef601d9085434 --- src/jamidht/jamiaccount.cpp | 11 ++++++----- src/jamidht/jamiaccount.h | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/jamidht/jamiaccount.cpp b/src/jamidht/jamiaccount.cpp index d087d8a075..d31fa7aca6 100644 --- a/src/jamidht/jamiaccount.cpp +++ b/src/jamidht/jamiaccount.cpp @@ -2168,19 +2168,20 @@ JamiAccount::doRegister_() config.peer_discovery = dhtPeerDiscovery_; config.peer_publish = dhtPeerDiscovery_; if (not config.proxy_server.empty()) - JAMI_WARN("[Account %s] using proxy server %s", getAccountID().c_str(), config.proxy_server.c_str()); + JAMI_INFO("[Account %s] using proxy server %s", getAccountID().c_str(), config.proxy_server.c_str()); if (not deviceKey_.empty()) { - JAMI_WARN("[Account %s] using push notifications", getAccountID().c_str()); + JAMI_INFO("[Account %s] using push notifications", getAccountID().c_str()); dht_.setPushNotificationToken(deviceKey_); } //check if dht peer service is enabled - if(accountPeerDiscovery_ || accountPublish_){ + if (accountPeerDiscovery_ or accountPublish_) { peerDiscovery_ = std::make_shared<dht::PeerDiscovery>(); - JAMI_INFO("Start Jami account discovering....."); - if(accountPeerDiscovery_) + if(accountPeerDiscovery_) { + JAMI_INFO("[Account %s] starting Jami account discovery...", getAccountID().c_str()); startAccountDiscovery(); + } if(accountPublish_) startAccountPublish(); } diff --git a/src/jamidht/jamiaccount.h b/src/jamidht/jamiaccount.h index 9ab91d0bc6..2327a038d7 100644 --- a/src/jamidht/jamiaccount.h +++ b/src/jamidht/jamiaccount.h @@ -701,7 +701,7 @@ class JamiAccount : public SIPAccountBase { std::shared_ptr<dht::PeerDiscovery> peerDiscovery_; std::map<dht::InfoHash, DiscoveredPeer> discoveredPeers_; std::map<std::string, std::string> discoveredPeerMap_; - bool accountPeerDiscovery_ {true}; + bool accountPeerDiscovery_ {false}; bool accountPublish_ {false}; std::shared_ptr<RepeatedTask> eventHandler {}; -- GitLab