From fdd7b9e5d067a2922d4b69047dcb36051947eac6 Mon Sep 17 00:00:00 2001 From: Adrien Beraud <adrien.beraud@savoirfairelinux.com> Date: Thu, 17 Aug 2023 17:32:18 -0400 Subject: [PATCH] contrib: update dhtnet Change-Id: Ia1bfda6db6383ca6b52a875535b7f8b8321a8fb4 --- contrib/src/dhtnet/package.json | 2 +- contrib/src/dhtnet/rules.mak | 5 +++-- src/account.cpp | 2 +- src/sip/sipcall.cpp | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/contrib/src/dhtnet/package.json b/contrib/src/dhtnet/package.json index 74e9a971c4..a45b1ded53 100644 --- a/contrib/src/dhtnet/package.json +++ b/contrib/src/dhtnet/package.json @@ -1,6 +1,6 @@ { "name": "dhtnet", - "version": "370257cdd858927172f4169acc8e873e8ae11f65", + "version": "c161aaa5e36cc2027ecdfb1c717d7131a669f7f5", "url": "https://review.jami.net/plugins/gitiles/dhtnet/+archive/__VERSION__.tar.gz", "deps": [ "opendht", diff --git a/contrib/src/dhtnet/rules.mak b/contrib/src/dhtnet/rules.mak index 21e2426124..bdfd613f34 100644 --- a/contrib/src/dhtnet/rules.mak +++ b/contrib/src/dhtnet/rules.mak @@ -1,5 +1,5 @@ # DHTNET -DHTNET_VERSION := 370257cdd858927172f4169acc8e873e8ae11f65 +DHTNET_VERSION := c161aaa5e36cc2027ecdfb1c717d7131a669f7f5 DHTNET_URL := https://review.jami.net/plugins/gitiles/dhtnet/+archive/$(DHTNET_VERSION).tar.gz PKGS += dhtnet @@ -7,7 +7,8 @@ PKGS += dhtnet DEPS_dhtnet += opendht pjproject asio DHTNET_CONF = -DBUILD_SHARED_LIBS=Off \ - -DBUILD_TESTING=Off + -DBUILD_TESTING=Off \ + -DCMAKE_BUILD_TYPE=Debug $(TARBALLS)/dhtnet-$(DHTNET_VERSION).tar.gz: $(call download,$(DHTNET_URL)) diff --git a/src/account.cpp b/src/account.cpp index cce1c7d796..eba6f664fe 100644 --- a/src/account.cpp +++ b/src/account.cpp @@ -101,7 +101,7 @@ Account::updateUpnpController() // UPNP enabled. Create new controller if needed. if (not upnpCtrl_) { - upnpCtrl_.reset(new dhtnet::upnp::Controller(Manager::instance().upnpContext())); + upnpCtrl_ = std::make_shared<dhtnet::upnp::Controller>(Manager::instance().upnpContext()); if (not upnpCtrl_) { throw std::runtime_error("Failed to create a UPNP Controller instance!"); } diff --git a/src/sip/sipcall.cpp b/src/sip/sipcall.cpp index 38ddfa3fb8..8dfc984778 100644 --- a/src/sip/sipcall.cpp +++ b/src/sip/sipcall.cpp @@ -116,7 +116,7 @@ SIPCall::SIPCall(const std::shared_ptr<SIPAccountBase>& account, jami_tracepoint(call_start, callId.c_str()); if (account->getUPnPActive()) - upnp_.reset(new dhtnet::upnp::Controller(Manager::instance().upnpContext())); + upnp_ = std::make_shared<dhtnet::upnp::Controller>(Manager::instance().upnpContext()); setCallMediaLocal(); -- GitLab