From fbeda916293f7b0d99fc16de5bc44e94b218cdd6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrien=20B=C3=A9raud?= <adrien.beraud@savoirfairelinux.com>
Date: Tue, 11 Feb 2020 17:21:14 -0500
Subject: [PATCH] contrib: update OpenDHT
Change-Id: I3ca5b2a63abe9290a723e8ebcab47ce81275a088
---
contrib/src/opendht/SHA512SUMS | 2 +-
contrib/src/opendht/package.json | 2 +-
contrib/src/opendht/rules.mak | 2 +-
src/jamidht/jamiaccount.cpp | 3 ++-
4 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/contrib/src/opendht/SHA512SUMS b/contrib/src/opendht/SHA512SUMS
index e044e84a3d..b5a42acca6 100644
--- a/contrib/src/opendht/SHA512SUMS
+++ b/contrib/src/opendht/SHA512SUMS
@@ -1 +1 @@
-bc66d58d764568f0cb4b38de9c655575bf0196df1ae4cd4a258373c4ed95bfc83b31293b09d6b5e9960b7ad4f17b2c8355c873c6c873f052516e41d8b608d128 opendht-2.0.0rc1.tar.gz
+a9f872017ce90ec8220dabe4569d8811850e34bad58524985110112d73b7c3555b44dffc3c5d0e0c9774b0d132356af67ba584336f14fc1bc857969925050dbe opendht-6c2f791c4dd9b52acb61194b4ebda2129d6e2ec3.tar.gz
\ No newline at end of file
diff --git a/contrib/src/opendht/package.json b/contrib/src/opendht/package.json
index c4a99a82ef..783a621622 100644
--- a/contrib/src/opendht/package.json
+++ b/contrib/src/opendht/package.json
@@ -1,6 +1,6 @@
{
"name": "opendht",
- "version": "2.0.0rc1",
+ "version": "6c2f791c4dd9b52acb61194b4ebda2129d6e2ec3",
"url": "https://github.com/savoirfairelinux/opendht/archive/__VERSION__.tar.gz",
"deps": [
"argon2",
diff --git a/contrib/src/opendht/rules.mak b/contrib/src/opendht/rules.mak
index b47ae5de58..41e78b075a 100644
--- a/contrib/src/opendht/rules.mak
+++ b/contrib/src/opendht/rules.mak
@@ -1,5 +1,5 @@
# OPENDHT
-OPENDHT_VERSION := 2.0.0rc1
+OPENDHT_VERSION := 6c2f791c4dd9b52acb61194b4ebda2129d6e2ec3
OPENDHT_URL := https://github.com/savoirfairelinux/opendht/archive/$(OPENDHT_VERSION).tar.gz
PKGS += opendht
diff --git a/src/jamidht/jamiaccount.cpp b/src/jamidht/jamiaccount.cpp
index bda38c16f0..b67319dfdd 100644
--- a/src/jamidht/jamiaccount.cpp
+++ b/src/jamidht/jamiaccount.cpp
@@ -1483,7 +1483,7 @@ JamiAccount::registerAsyncOps()
doRegister_();
};
- loadCachedProxyServer([this, onLoad](const std::string& proxy) {
+ loadCachedProxyServer([onLoad](const std::string& proxy) {
onLoad();
});
@@ -1690,6 +1690,7 @@ JamiAccount::doRegister_()
config.dht_config.node_config.maintain_storage = false;
config.dht_config.node_config.persist_path = cachePath_+DIR_SEPARATOR_STR "dhtstate";
config.dht_config.id = id_;
+ config.dht_config.cert_cache_all = true;
config.proxy_server = getDhtProxyServer(proxyServer_);
config.push_node_id = getAccountID();
config.push_token = deviceKey_;
--
GitLab