From be7b84ce1b15d913e34d7f198fc45b15b3b9d3c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrien=20B=C3=A9raud?= <adrien.beraud@savoirfairelinux.com>
Date: Thu, 27 Jul 2023 10:10:07 -0400
Subject: [PATCH] jamiaccount: remove dhParams
Change-Id: Ic2fd0adc7a81faefd95c595b8e8f25414f9c38d4
---
src/jamidht/jamiaccount.cpp | 13 -------------
src/jamidht/jamiaccount.h | 9 ---------
2 files changed, 22 deletions(-)
diff --git a/src/jamidht/jamiaccount.cpp b/src/jamidht/jamiaccount.cpp
index dc029ef8a3..d44542d312 100644
--- a/src/jamidht/jamiaccount.cpp
+++ b/src/jamidht/jamiaccount.cpp
@@ -1580,10 +1580,6 @@ JamiAccount::doRegister()
|| registrationState_ == RegistrationState::ERROR_NEED_MIGRATION)
return;
- if (not dhParams_.valid()) {
- generateDhParams();
- }
-
setRegistrationState(RegistrationState::TRYING);
/* if UPnP is enabled, then wait for IGD to complete registration */
if (upnpCtrl_ or proxyServerCached_.empty()) {
@@ -2654,15 +2650,6 @@ JamiAccount::getDhtProxyServer(const std::string& serverList)
return proxyServerCached_;
}
-void
-JamiAccount::generateDhParams()
-{
- // make sure cachePath_ is writable
- fileutils::check_dir(cachePath_.c_str(), 0700);
- dhParams_ = dht::ThreadPool::computation().get<dhtnet::tls::DhParams>(
- std::bind(dhtnet::tls::DhParams::loadDhParams, cachePath_ + DIR_SEPARATOR_STR "dhParams"));
-}
-
MatchRank
JamiAccount::matches(std::string_view userName, std::string_view server) const
{
diff --git a/src/jamidht/jamiaccount.h b/src/jamidht/jamiaccount.h
index c00cd41124..4f147a8190 100644
--- a/src/jamidht/jamiaccount.h
+++ b/src/jamidht/jamiaccount.h
@@ -377,11 +377,6 @@ public:
return id_;
}
- const std::shared_future<dhtnet::tls::DhParams> dhParams() const
- {
- return dhParams_;
- }
-
void forEachDevice(const dht::InfoHash& to,
std::function<void(const std::shared_ptr<dht::crypto::PublicKey>&)>&& op,
std::function<void(bool)>&& end = {});
@@ -753,10 +748,6 @@ private:
*/
std::string proxyServerCached_ {};
- std::mutex dhParamsMtx_ {};
- std::shared_future<dhtnet::tls::DhParams> dhParams_;
- std::condition_variable dhParamsCv_;
-
/**
* Optional: via_addr construct from received parameters
*/
--
GitLab