From 1c438e5f9e602ab4742071309e52a0dcdd29c11c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrien=20B=C3=A9raud?= <adrien.beraud@savoirfairelinux.com>
Date: Thu, 25 Dec 2014 19:28:40 -0500
Subject: [PATCH] ringdht: update for new OpenDHT API
Refs #61678
Refs #61680
Change-Id: Ifdd35cfe89a7df6227f345a7b3a26ae4d74ee765
---
daemon/contrib/src/opendht/rules.mak | 2 +-
daemon/src/ringdht/ringaccount.h | 5 +++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/daemon/contrib/src/opendht/rules.mak b/daemon/contrib/src/opendht/rules.mak
index d5877138b5..180c0bb579 100644
--- a/daemon/contrib/src/opendht/rules.mak
+++ b/daemon/contrib/src/opendht/rules.mak
@@ -1,5 +1,5 @@
# OPENDHT
-OPENDHT_VERSION := fde26fef5b2dfbcb5960fb91a75f86a83b5b1f3c
+OPENDHT_VERSION := 33542e932a3cb7c970ffc2196a21b85aec17807f
OPENDHT_URL := https://github.com/savoirfairelinux/opendht/archive/$(OPENDHT_VERSION).tar.gz
PKGS += opendht
diff --git a/daemon/src/ringdht/ringaccount.h b/daemon/src/ringdht/ringaccount.h
index 72d59d9204..855dc0fea9 100644
--- a/daemon/src/ringdht/ringaccount.h
+++ b/daemon/src/ringdht/ringaccount.h
@@ -50,6 +50,7 @@
#include <vector>
#include <map>
+#include <chrono>
namespace Conf {
const char *const DHT_PORT_KEY = "dhtPort";
@@ -254,8 +255,8 @@ class RingAccount : public SIPAccountBase {
private:
- const dht::ValueType USER_PROFILE_TYPE = {9, "User profile", 60 * 60 * 24 * 7};
- const dht::ValueType ICE_ANNOUCEMENT_TYPE = {10, "ICE descriptors", 15 * 60};
+ const dht::ValueType USER_PROFILE_TYPE = {9, "User profile", std::chrono::hours(24 * 7)};
+ const dht::ValueType ICE_ANNOUCEMENT_TYPE = {10, "ICE descriptors", std::chrono::minutes(15)};
void createOutgoingCall(const std::shared_ptr<SIPCall>& call, const std::string& to_id, IpAddr target);
--
GitLab