From ba49e66dc7629e59ac8d90dc7a558bb74fa56bdb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrien=20B=C3=A9raud?= <adrien.beraud@savoirfairelinux.com>
Date: Fri, 9 Oct 2015 15:59:55 -0400
Subject: [PATCH] ringdht: report username with ring: prefix
Prefixing ring IDs allows to recognize them easily
and to link them to Ring from external tools.
Tuleap: #14
Change-Id: I4ef64fbd2973dec5a8c1151da3ab3370d5330370
---
src/ringdht/ringaccount.cpp | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/ringdht/ringaccount.cpp b/src/ringdht/ringaccount.cpp
index 37cb52061c..c031f24d5c 100644
--- a/src/ringdht/ringaccount.cpp
+++ b/src/ringdht/ringaccount.cpp
@@ -76,6 +76,8 @@ static constexpr int ICE_COMP_SIP_TRANSPORT {0};
static constexpr int ICE_INIT_TIMEOUT {5};
static constexpr int ICE_NEGOTIATION_TIMEOUT {60};
+static constexpr const char * const RING_URI_PREFIX = "ring:";
+
constexpr const char * const RingAccount::ACCOUNT_TYPE;
/* constexpr */ const std::pair<uint16_t, uint16_t> RingAccount::DHT_PORT_RANGE {4000, 8888};
@@ -150,7 +152,7 @@ template <>
std::shared_ptr<SIPCall>
RingAccount::newOutgoingCall(const std::string& toUrl)
{
- auto dhtf = toUrl.find("ring:");
+ auto dhtf = toUrl.find(RING_URI_PREFIX);
if (dhtf != std::string::npos) {
dhtf = dhtf+5;
} else {
@@ -468,11 +470,11 @@ RingAccount::loadIdentity()
tlsPrivateKeyFile_ = idPath_ + DIR_SEPARATOR_STR "dht.key";
tlsPassword_ = {};
- username_ = id.second->getId().toString();
+ username_ = RING_URI_PREFIX+id.second->getId().toString();
return id;
}
- username_ = dht_cert.getId().toString();
+ username_ = RING_URI_PREFIX+dht_cert.getId().toString();
return {
std::make_shared<dht::crypto::PrivateKey>(std::move(dht_key)),
std::make_shared<dht::crypto::Certificate>(std::move(dht_cert))
@@ -753,8 +755,6 @@ RingAccount::doRegister_()
dht_.importValues(loadValues());
- username_ = dht_.getId().toString();
-
Manager::instance().registerEventHandler((uintptr_t)this, [this]{ handleEvents(); });
setRegistrationState(RegistrationState::TRYING);
--
GitLab