From 8efba861fee3e1fcee5b2187233fac26b94c5df6 Mon Sep 17 00:00:00 2001
From: Guillaume Roguez <guillaume.roguez@savoirfairelinux.com>
Date: Wed, 13 May 2015 21:17:46 -0400
Subject: [PATCH] opendht: bump to b50f368dc8
Include fixes:
[b50f368dc8] infohash: fix buffer-overflow
Refs #73065
Change-Id: Ida437a7dd0043988bca2135842d07ae1bd5c6873
---
contrib/src/opendht/rules.mak | 2 +-
src/ringdht/ringaccount.cpp | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/contrib/src/opendht/rules.mak b/contrib/src/opendht/rules.mak
index 6c96b4684a..2019e84c1c 100644
--- a/contrib/src/opendht/rules.mak
+++ b/contrib/src/opendht/rules.mak
@@ -1,5 +1,5 @@
# OPENDHT
-OPENDHT_VERSION := 48c10af32fca51cac8c7f9dca54e17595152e73b
+OPENDHT_VERSION := b50f368dc8f7c2bc9c11b61b66ac6fd63597aecd
OPENDHT_URL := https://github.com/savoirfairelinux/opendht/archive/$(OPENDHT_VERSION).tar.gz
PKGS += opendht
diff --git a/src/ringdht/ringaccount.cpp b/src/ringdht/ringaccount.cpp
index 24e756fd4e..379b115886 100644
--- a/src/ringdht/ringaccount.cpp
+++ b/src/ringdht/ringaccount.cpp
@@ -82,7 +82,7 @@ namespace ring {
static constexpr int ICE_COMPONENTS {1};
static constexpr int ICE_COMP_SIP_TRANSPORT {0};
static constexpr int ICE_INIT_TIMEOUT {5};
-static constexpr int ICE_NEGOTIATION_TIMEOUT {60};
+static constexpr int ICE_NEGOTIATION_TIMEOUT {300};
constexpr const char * const RingAccount::ACCOUNT_TYPE;
/* constexpr */ const std::pair<uint16_t, uint16_t> RingAccount::DHT_PORT_RANGE {4000, 8888};
@@ -687,11 +687,11 @@ void RingAccount::doRegister_()
}
});
-#if 0 // enable if dht_ logging is needed
+#if 1 // enable if dht_ logging is needed
dht_.setLoggers(
[](char const* m, va_list args){ vlogger(LOG_ERR, m, args); },
- [](char const* m, va_list args){ vlogger(LOG_WARNING, m, args); },
- [](char const* m, va_list args){ vlogger(LOG_DEBUG, m, args); }
+ [](char const* m, va_list args){ /*vlogger(LOG_WARNING, m, args);*/ },
+ [](char const* m, va_list args){ /*vlogger(LOG_DEBUG, m, args);*/ }
);
#endif
--
GitLab