From 441a84b612223a2b76d38fb0ecd74dae478d8c2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrien=20B=C3=A9raud?= <adrien.beraud@savoirfairelinux.com> Date: Wed, 28 Dec 2016 15:29:44 -0500 Subject: [PATCH] ringaccount: use hostname as default device name Change-Id: I86c52900c2e20be5f7c331126180c37f0e17719c --- src/ringdht/ringaccount.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/ringdht/ringaccount.cpp b/src/ringdht/ringaccount.cpp index 6cc5c2ca83..f0e6e8160c 100644 --- a/src/ringdht/ringaccount.cpp +++ b/src/ringdht/ringaccount.cpp @@ -695,7 +695,9 @@ RingAccount::createRingDevice(const dht::crypto::Identity& id) tlsPassword_ = {}; identity_ = dev_id; ringDeviceId_ = dev_id.first->getPublicKey().getId().toString(); - ringDeviceName_ = ringDeviceId_.substr(8); + ringDeviceName_ = ip_utils::getHostname(); + if (ringDeviceName_.empty()) + ringDeviceName_ = ringDeviceId_.substr(8); receipt_ = makeReceipt(id); RING_WARN("createRingDevice with %s", id.first->getPublicKey().getId().toString().c_str()); -- GitLab