Commit 8b9940eb authored by Philippe Gorley's avatar Philippe Gorley Committed by Adrien Béraud

rename Ring to Jami

Removes refrences to project name in logs and comments where it doesn't
matter whether or not the name is specified.

Change-Id: I17f99390226929ee620bc479b203825389bb3d4d
parent 70714446
......@@ -2,8 +2,8 @@ DRing (2.2.0) / 2015-05-01
* DBus API changes (additions from patches below)
* Contrib: use PJSIP 2.4 and gnutls 3.4 if not provided by system
* Contrib: minimal gnutls is 3.3.0
=> Users of 2.1.1 and below may have to recreate their Ring account
and have a new RingID.
=> Users of 2.1.1 and below may have to recreate their Jami account
and have a new ID.
* Implemented CA storage (alpha stage)
* Better Window support
* Security: Implement TLS validator N, CN and O ldap fields
......
......@@ -5,8 +5,8 @@
<tp:docstring xmlns="http://www.w3.org/1999/xhtml">
<p>The CallManager interface is used to manage call and conference related actions.</p>
<p>Since Ring-daemon supports multiple incoming/outgoing calls, any actions involving a specific call must address the method by the means of a unique callID.
Ring-daemon will generate a unique callID for outgoing and incoming calls.</p>
<p>Since daemon supports multiple incoming/outgoing calls, any actions involving a specific call must address the method by the means of a unique callID.
Daemon will generate a unique callID for outgoing and incoming calls.</p>
</tp:docstring>
<method name="placeCall" tp:name-for-bindings="placeCall">
<tp:docstring>
......@@ -255,8 +255,8 @@
<method name="addMainParticipant" tp:name-for-bindings="addMainParticipant">
<tp:added version="0.9.7"/>
<tp:docstring>
<p>As the core can handle multiple calls and conferences, it may happen that the client's user leaves a conference to answer an incoming call or to start new calls. This method is used to reintroduce Ring-client's user into the conference.</p>
<p>Its put the current call on HOLD or detaches Ring-client's user from the another conference.</p>
<p>As the core can handle multiple calls and conferences, it may happen that the client's user leaves a conference to answer an incoming call or to start new calls. This method is used to reintroduce client's user into the conference.</p>
<p>Its put the current call on HOLD or detaches client's user from the another conference.</p>
</tp:docstring>
<arg type="s" name="confID" direction="in">
<tp:docstring>
......@@ -598,11 +598,11 @@
<tp:docstring>
The acceptable states are:
<ul>
<li>ACTIVE_ATTACHED: Ring user is
<li>ACTIVE_ATTACHED: user is
participating to this conference</li>
<li>ACTIVE_DETACHED: This situation can
occur if a call is received while
Ring user is participating to a
user is participating to a
conference. In this case, one can leave
the conference by answering the
call. Other participants may continue
......@@ -651,7 +651,7 @@
<signal name="conferenceCreated" tp:name-for-bindings="conferenceCreated">
<tp:added version="0.9.7"/>
<tp:docstring>
Emitted when a new conference is created. Ring-client is responsible for storing the confID and call <tp:member-ref>getParticipantList</tp:member-ref> to update the display.
Emitted when a new conference is created. Client is responsible for storing the confID and call <tp:member-ref>getParticipantList</tp:member-ref> to update the display.
</tp:docstring>
<arg type="s" name="confID">
<tp:docstring>
......@@ -663,7 +663,7 @@
<signal name="conferenceRemoved" tp:name-for-bindings="conferenceRemoved">
<tp:added version="0.9.7"/>
<tp:docstring>
Emitted when a new conference is remove. Ring-client should have kept a list of current participant in order to display modification.
Emitted when a new conference is remove. Client should have kept a list of current participant in order to display modification.
</tp:docstring>
<arg type="s" name="confID">
<tp:docstring>
......@@ -730,7 +730,7 @@
<p>Transfer has been successfully
processed. Client should remove transferred
call from call list as it is no longer
accessible in Ring-daemon (dring).</p>
accessible in daemon (dring).</p>
</tp:docstring>
</signal>
......@@ -738,7 +738,7 @@
<tp:docstring>
<p>Transfer operation failed. Corresponding
call is no longer accessible in
Ring-daemon (dring).</p>
daemon (dring).</p>
</tp:docstring>
</signal>
......
......@@ -976,7 +976,7 @@
<tp:added version="2.0.0"/>
<tp:docstring>
Returns a list of supported encryption ciphers used to encrypt SIP messages. The list depends on the TLS library being used.
Only registered SIP accounts currently support setting custom ciphers. This method returns an empty list if TLS support is disabled in either pjproject or Ring.
Only registered SIP accounts currently support setting custom ciphers. This method returns an empty list if TLS support is disabled in either pjproject or Jami.
</tp:docstring>
<arg type="s" name="accountID" direction="in">
<tp:docstring>
......
......@@ -42,7 +42,7 @@ static void
print_title()
{
std::cout
<< "Ring Daemon " << DRing::version()
<< "Jami Daemon " << DRing::version()
<< ", by Savoir-faire Linux 2004-2018" << std::endl
<< "https://jami.net/" << std::endl
#ifdef RING_VIDEO
......
......@@ -46,7 +46,7 @@ static void
print_title()
{
std::cout
<< "Ring Daemon " << DRing::version()
<< "Jami Daemon " << DRing::version()
<< ", by Savoir-faire Linux 2004-2018" << std::endl
<< "https://jami.net/" << std::endl
#ifdef RING_VIDEO
......
dnl Ring - configure.ac for automake 1.9 and autoconf 2.59
dnl Jami - configure.ac for automake 1.9 and autoconf 2.59
dnl Process this file with autoconf to produce a configure script.
AC_PREREQ([2.65])
......@@ -406,15 +406,15 @@ AS_IF([test "x$with_dbus" = "xyes"], [
AM_CONDITIONAL(RING_DBUS, true)],TESTS= $(check_PROGRAMS)
AM_CONDITIONAL(RING_DBUS, false));
dnl Ring name service is default-enabled
AC_ARG_ENABLE([ringns], AS_HELP_STRING([--disable-ringns], [Enable Ring Name Service]))
AM_CONDITIONAL([RINGNS], test "x$enable_ringns" != "xno", [Define if you use the Ring Name Service])
AC_DEFINE_UNQUOTED([HAVE_RINGNS], `if test "x$enable_ringns" != "xno"; then echo 1; else echo 0; fi`, [Define if you use the Ring Name Service])
dnl name service is default-enabled
AC_ARG_ENABLE([ringns], AS_HELP_STRING([--disable-ringns], [Enable Name Service]))
AM_CONDITIONAL([RINGNS], test "x$enable_ringns" != "xno", [Define if you use the Name Service])
AC_DEFINE_UNQUOTED([HAVE_RINGNS], `if test "x$enable_ringns" != "xno"; then echo 1; else echo 0; fi`, [Define if you use the Name Service])
dnl Ring nodejs module
AC_ARG_WITH([nodejs], AS_HELP_STRING([--with-nodejs], [Enable Ring NodeJS module]))
AM_CONDITIONAL([RING_NODEJS], test "x$enable_nodejs" != "xno", [Define if you use the Ring NodeJS module])
AC_DEFINE_UNQUOTED([HAVE_NODEJS], `if test "x$enable_ringns" != "xno"; then echo 1; else echo 0; fi`, [Define if you use the Ring NodeJS module])
dnl nodejs module
AC_ARG_WITH([nodejs], AS_HELP_STRING([--with-nodejs], [Enable NodeJS module]))
AM_CONDITIONAL([RING_NODEJS], test "x$enable_nodejs" != "xno", [Define if you use the NodeJS module])
AC_DEFINE_UNQUOTED([HAVE_NODEJS], `if test "x$enable_ringns" != "xno"; then echo 1; else echo 0; fi`, [Define if you use the NodeJS module])
AS_IF([test "x$with_nodejs" = "xyes"], [
AC_PATH_PROG(SWIG, swig, "")
AS_AC_EXPAND(SBINDIR, $sbindir)
......@@ -488,11 +488,11 @@ AS_IF([test "x$enable_video" != "xno"],
AC_ARG_ENABLE([accel], AS_HELP_STRING([--disable-accel], [Disable all hardware accelerations (enabled by default)]))
AS_IF([test "x$enable_video" != "xno" -a "x$enable_accel" != "xno"], [
dnl if new hwaccel api is found, activate Ring's hardware accel
dnl if new hwaccel api is found, activate hardware accel
dnl prefix needs to be different from the one above
PKG_CHECK_MODULES(AVUTIL, libavutil >= 55.75.100, [
ring_accel="yes"
AC_DEFINE([RING_ACCEL], [1], [Hardware acceleration is enabled in Ring])
AC_DEFINE([RING_ACCEL], [1], [Hardware acceleration is enabled])
AS_IF([test "${SYS}" = "linux" && test -z "${HAVE_ANDROID_FALSE}"], [
dnl ffmpeg's vaapi and vdpau implementations depend on x11
PKG_CHECK_MODULES([X11], [x11], [x11_available="yes"], [x11_available="no"])
......@@ -506,13 +506,13 @@ AS_IF([test "x$enable_video" != "xno" -a "x$enable_accel" != "xno"], [
], [])
AC_CHECK_HEADERS([libavcodec/vaapi.h], [
ring_vaapi="yes"
AC_DEFINE([RING_VAAPI], [1], [Defined if vaapi is available in Ring])
AC_DEFINE([RING_VAAPI], [1], [Defined if vaapi is available])
])
], [])
PKG_CHECK_MODULES([VDPAU], [vdpau], [
AC_CHECK_HEADERS([libavcodec/vdpau.h], [
ring_vdpau="yes"
AC_DEFINE([RING_VDPAU], [1], [Defined if vdpau is available in Ring])
AC_DEFINE([RING_VDPAU], [1], [Defined if vdpau is available])
])
], [])
])
......@@ -521,7 +521,7 @@ AS_IF([test "x$enable_video" != "xno" -a "x$enable_accel" != "xno"], [
AC_CHECK_HEADER([VideoToolbox/VideoToolbox.h], [
AC_CHECK_HEADER([libavcodec/videotoolbox.h], [
ring_vt="yes"
AC_DEFINE([RING_VIDEOTOOLBOX], [1], [Defined if videotoolbox is available in Ring])
AC_DEFINE([RING_VIDEOTOOLBOX], [1], [Defined if videotoolbox is available])
])
])
])
......
......@@ -2,7 +2,7 @@
xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0"
xmlns:xi="http://www.w3.org/2001/XInclude">
<tp:title>Ring D-Bus Interface Specification</tp:title>
<tp:title>Jami D-Bus Interface Specification</tp:title>
<tp:version>2.3.0</tp:version>
<tp:copyright>Copyright © 2005-2016 Savoir-faire Linux Inc</tp:copyright>
......
......@@ -4,7 +4,7 @@
# Project related configuration options
#---------------------------------------------------------------------------
DOXYFILE_ENCODING = UTF-8
PROJECT_NAME = Ring GTK GUI
PROJECT_NAME = Jami GTK GUI
PROJECT_NUMBER =
OUTPUT_DIRECTORY =
CREATE_SUBDIRS = NO
......
......@@ -111,7 +111,7 @@ $CXX
PREFIX=\$(abspath ./build)
all: $NEEDED
@echo "You are ready to build Ring and its contribs"
@echo "You are ready to build Jami and its contribs"
include tools.mak
EOF
=head1 NAME
dring - core daemon for Ring: secure and distributed voice, video and chat communication platform.
dring - core daemon for Jami: secure and distributed voice, video and chat communication platform.
=head1 SYNOPSIS
......@@ -8,9 +8,9 @@ B<dring> [OPTION]...
=head1 DESCRIPTION
Ring is meant to be a robust enterprise-class desktop phone. It provides functions like call transfer, call hold, multiple lines, multiple accounts support.
Ring audio layer is build upon a native ALSA interface and and a native PulseAudio interface.
B<dring> is the core of Ring; it communicates with the client side through DBus. You need to install a client to use the daemon, for instance GTK+ client, B<gnome-ring>.
Jami is meant to be a robust enterprise-class desktop phone. It provides functions like call transfer, call hold, multiple lines, multiple accounts support.
Jami audio layer is build upon a native ALSA interface and and a native PulseAudio interface.
B<dring> is the core of Jami; it communicates with the client side through DBus. You need to install a client to use the daemon, for instance GTK+ client, B<gnome-ring>.
=head1 OPTIONS
......
......@@ -1697,9 +1697,9 @@ Manager::saveConfig(const std::shared_ptr<RingAccount>& account)
std::lock_guard<std::mutex> lock(fileutils::getFileLock(accountConfig));
std::ofstream fout(accountConfig);
fout << accountOut.c_str();
RING_DBG("Exported Ring account to %s", accountConfig.c_str());
RING_DBG("Exported account to %s", accountConfig.c_str());
} catch (const std::exception& e) {
RING_ERR("Error exporting Ring account: %s", e.what());
RING_ERR("Error exporting account: %s", e.what());
}
}
......@@ -2820,7 +2820,7 @@ Manager::loadAccountMap(const YAML::Node& node)
a->unserialize(parsedConfig);
}
} catch (const std::exception& e) {
RING_ERR("Can't import Ring account %s: %s", dir.c_str(), e.what());
RING_ERR("Can't import account %s: %s", dir.c_str(), e.what());
}
}
{
......
......@@ -57,7 +57,7 @@ class IceTransportFactory;
class DataTransferFacade;
class RingAccount;
/** Manager (controller) of Ring daemon */
/** Manager (controller) of daemon */
class Manager {
public:
static Manager& instance();
......@@ -826,7 +826,7 @@ class Manager {
void unregisterAccounts();
/**
* Suspends Ring's audio processing if no calls remain, allowing
* Suspends audio processing if no calls remain, allowing
* other applications to resume audio.
* See:
* https://projects.savoirfairelinux.com/issues/7037
......
......@@ -280,7 +280,7 @@ class AudioLayer {
mutable std::condition_variable startedCv_;
/**
* Sample Rate Ring should send sound data to the sound card
* Sample Rate that should be sent to the sound card
*/
AudioFormat audioFormat_;
......
......@@ -39,7 +39,7 @@ constexpr const char* const QUERY_ADDR {"/addr/"};
constexpr const char* const HTTPS_PROTO {"https://"};
constexpr const char* const CACHE_DIRECTORY {"namecache"};
/** Parser for Ring URIs. ( protocol ) ( username ) ( hostname ) */
/** Parser for URIs. ( protocol ) ( username ) ( hostname ) */
const std::regex URI_VALIDATOR {"^([a-zA-Z]+:(?://)?)?(?:([a-z0-9-_]{1,64})@)?([a-zA-Z0-9\\-._~%!$&'()*+,;=:\\[\\]]+)"};
const std::regex NAME_VALIDATOR {"^[a-zA-Z0-9-_]{3,32}$"};
......
......@@ -161,7 +161,7 @@ RingAccount::TrustRequest {
};
/**
* Represents a known device attached to this Ring account
* Represents a known device attached to this account
*/
struct RingAccount::KnownDevice
{
......@@ -407,7 +407,7 @@ RingAccount::startOutgoingCall(const std::shared_ptr<SIPCall>& call, const std::
});
#endif
// Find listening Ring devices for this account
// Find listening devices for this account
dht::InfoHash peer_account(toUri);
forEachDevice(peer_account, [wCall, toUri, peer_account](const std::shared_ptr<RingAccount>& sthis, const dht::InfoHash& dev)
{
......@@ -771,14 +771,14 @@ RingAccount::createRingDevice(const dht::crypto::Identity& id)
receipt_ = makeReceipt(id);
receiptSignature_ = id.first->sign({receipt_.begin(), receipt_.end()});
RING_WARN("[Account %s] created new Ring device: %s (%s)",
RING_WARN("[Account %s] created new device: %s (%s)",
getAccountID().c_str(), ringDeviceId_.c_str(), ringDeviceName_.c_str());
}
void
RingAccount::initRingDevice(const AccountArchive& a)
{
RING_WARN("[Account %s] creating new Ring device from archive", getAccountID().c_str());
RING_WARN("[Account %s] creating new device from archive", getAccountID().c_str());
SIPAccountBase::setAccountDetails(a.config);
parseInt(a.config, Conf::CONFIG_DHT_PORT, dhtPort_);
parseBool(a.config, Conf::CONFIG_DHT_PUBLIC_IN_CALLS, dhtPublicInCalls_);
......@@ -1049,7 +1049,7 @@ RingAccount::addDevice(const std::string& password)
std::string pin_str;
AccountArchive a;
try {
RING_DBG("[Account %s] exporting Ring account", this_->getAccountID().c_str());
RING_DBG("[Account %s] exporting account", this_->getAccountID().c_str());
a = this_->readArchive(password);
......@@ -1278,7 +1278,7 @@ RingAccount::loadAccountFromDHT(const std::string& archive_password, const std::
void
RingAccount::createAccount(const std::string& archive_password, dht::crypto::Identity&& migrate)
{
RING_WARN("[Account %s] creating new Ring account", getAccountID().c_str());
RING_WARN("[Account %s] creating new account", getAccountID().c_str());
setRegistrationState(RegistrationState::INITIALIZING);
auto sthis = std::static_pointer_cast<RingAccount>(shared_from_this());
ThreadPool::instance().run([sthis,archive_password,migrate]() mutable {
......@@ -1323,7 +1323,7 @@ RingAccount::createAccount(const std::string& archive_password, dht::crypto::Ide
Manager::instance().removeAccount(sthis->getAccountID());
});
}
RING_DBG("[Account %s] Ring account creation ended, saving configuration", this_.getAccountID().c_str());
RING_DBG("[Account %s] Account creation ended, saving configuration", this_.getAccountID().c_str());
this_.setRegistrationState(RegistrationState::UNREGISTERED);
Manager::instance().saveConfig();
this_.doRegister();
......@@ -1420,7 +1420,7 @@ RingAccount::loadAccount(const std::string& archive_password, const std::string&
if (registrationState_ == RegistrationState::INITIALIZING)
return;
RING_DBG("[Account %s] loading Ring account", getAccountID().c_str());
RING_DBG("[Account %s] loading account", getAccountID().c_str());
try {
auto id = loadIdentity(tlsCertificateFile_, tlsPrivateKeyFile_, tlsPassword_);
bool hasArchive = not archivePath_.empty()
......@@ -1883,7 +1883,7 @@ RingAccount::doRegister()
// invalid state transitions:
// INITIALIZING: generating/loading certificates, can't register
// NEED_MIGRATION: old Ring account detected, user needs to migrate
// NEED_MIGRATION: old account detected, user needs to migrate
if (registrationState_ == RegistrationState::INITIALIZING
|| registrationState_ == RegistrationState::ERROR_NEED_MIGRATION)
return;
......@@ -3303,7 +3303,7 @@ RingAccount::sendTextMessage(const std::string& to, const std::map<std::string,
};
auto confirm = std::make_shared<PendingConfirmation>();
// Find listening Ring devices for this account
// Find listening devices for this account
forEachDevice(toH, [confirm,token,payloads,now](const std::shared_ptr<RingAccount>& this_, const dht::InfoHash& dev)
{
auto e = this_->sentMessages_.emplace(token, PendingMessage {});
......
......@@ -198,7 +198,7 @@ class RingAccount : public SIPAccountBase {
std::string getToUri(const std::string& username) const override;
/**
* In the current version of Ring, "srv" uri is obtained in the preformated
* In the current version, "srv" uri is obtained in the preformated
* way: hostname:port. This method adds the correct scheme and append
* the ;transport= parameter at the end of the uri, in accordance with RFC3261.
*
......@@ -368,7 +368,7 @@ class RingAccount : public SIPAccountBase {
/**
* Inform that a potential peer device have been found.
* Returns true only if the device certificate is a valid Ring device certificate.
* Returns true only if the device certificate is a valid device certificate.
* In that case (true is returned) the account_id parameter is set to the peer account ID.
*/
static bool foundPeerDevice(const std::shared_ptr<dht::crypto::Certificate>& crt, dht::InfoHash& account_id);
......@@ -542,7 +542,7 @@ class RingAccount : public SIPAccountBase {
void updateContact(const dht::InfoHash&, const Contact&);
void addContact(const dht::InfoHash&, bool confirmed = false);
// Trust store with Ring account main certificate as the only CA
// Trust store with account main certificate as the only CA
dht::crypto::TrustList accountTrust_;
// Trust store for to match peer certificates
tls::TrustStore trust_;
......
......@@ -996,7 +996,7 @@ TlsValidator::CheckResult TlsValidator::authorityMatch()
*/
TlsValidator::CheckResult TlsValidator::knownAuthority()
{
// TODO Ring need a new boolean account setting "require trusted authority" or something defaulting to true
// TODO need a new boolean account setting "require trusted authority" or something defaulting to true
// using GNUTLS_CERT_SIGNER_NOT_FOUND is a temporary placeholder as it is close enough
return TlsValidator::CheckResult(compareToCa() & GNUTLS_CERT_SIGNER_NOT_FOUND
? CheckValues::FAILED : CheckValues::PASSED, "");
......
......@@ -356,7 +356,7 @@ class SIPAccount : public SIPAccountBase {
std::string getToUri(const std::string& username) const override;
/**
* In the current version of Ring, "srv" uri is obtained in the preformated
* In the current version, "srv" uri is obtained in the preformatted
* way: hostname:port. This method adds the correct scheme and append
* the ;transport= parameter at the end of the uri, in accordance with RFC3261.
*
......@@ -615,7 +615,7 @@ class SIPAccount : public SIPAccountBase {
* If username is not provided, as it happens for Direct ip calls,
* fetch the Real Name field of the user that is currently
* running this program.
* @return std::string The login name under which Ring is running.
* @return std::string The login name under which the software is running.
*/
static std::string getLoginName();
......
......@@ -398,13 +398,13 @@ _CPP_HEADERS = frozenset([
# List of unapproved C++11 headers
_UNAPPROVED_CPP11_HEADERS = frozenset([
'cfenv',
# Ring approved: 'condition_variable',
# Jami approved: 'condition_variable',
'fenv.h',
# Ring approved: 'future',
# Ring approved: 'mutex',
# Ring approved: 'thread',
# Ring approved: 'chrono',
# Ring approved: 'ratio',
# Jami approved: 'future',
# Jami approved: 'mutex',
# Jami approved: 'thread',
# Jami approved: 'chrono',
# Jami approved: 'ratio',
'regex',
'system_error',
])
......
......@@ -351,7 +351,7 @@ class DRingCtrl(Thread):
def addAccount(self, details=None):
"""Add a new account account
Add a new account to the Ring-daemon. Default parameters are \
Add a new account to the daemon. Default parameters are \
used for missing account configuration field.
Required parameters are type, alias, hostname, username and password
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment