Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
J
jami-daemon
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
136
Issues
136
List
Boards
Labels
Service Desk
Milestones
Iterations
Requirements
Requirements
List
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Operations
Operations
Incidents
Analytics
Analytics
Insights
Issue
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
savoirfairelinux
jami-daemon
Commits
812b7b07
Commit
812b7b07
authored
Nov 30, 2018
by
Sébastien Blin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
misc: move *.ring.cx to *.jami.net
Change-Id: I1ab42b470f75aa1291aaebd625bfa11984258080
parent
4f26d8ee
Changes
14
Hide whitespace changes
Inline
Side-by-side
Showing
14 changed files
with
19 additions
and
19 deletions
+19
-19
CODING
CODING
+2
-2
README
README
+3
-3
astylerc
astylerc
+1
-1
bin/main.cpp
bin/main.cpp
+2
-2
bin/osxmain.cpp
bin/osxmain.cpp
+1
-1
bin/winmain.cpp
bin/winmain.cpp
+1
-1
doc/README
doc/README
+1
-1
src/media/media_recorder.cpp
src/media/media_recorder.cpp
+1
-1
src/media/media_recorder.h
src/media/media_recorder.h
+1
-1
src/ringdht/namedirectory.h
src/ringdht/namedirectory.h
+1
-1
src/ringdht/p2p.cpp
src/ringdht/p2p.cpp
+1
-1
src/ringdht/ringaccount.cpp
src/ringdht/ringaccount.cpp
+1
-1
src/ringdht/ringaccount.h
src/ringdht/ringaccount.h
+2
-2
test/turn/test_TURN.cpp
test/turn/test_TURN.cpp
+1
-1
No files found.
CODING
View file @
812b7b07
= Coding Standards =
Please follow our coding standards when developing:
https://
tuleap.ring.cx/plugins/mediawiki/wiki/ring/index.php?title=Libring_-_Coding_R
ules
https://
git.ring.cx/savoirfairelinux/ring-project/wikis/guidelines/Libring-coding-r
ules
= Gerrit Workflow =
Gerrit is used as a code review tool. It is also the primary Git repository.
Wiki documentation: https://
tuleap.ring.cx/plugins/mediawiki/wiki/ring/index.php?title=Working_with_G
errit
Wiki documentation: https://
git.ring.cx/savoirfairelinux/ring-project/wikis/tutorials/Working-with-g
errit
== Commit Messages ==
...
...
README
View file @
812b7b07
...
...
@@ -34,7 +34,7 @@ the shell.
GNU Ring is currently used by the support team of Savoir-faire Linux Inc.
More information is available on the project homepage:
https://www.
ring.cx
/
https://www.
jami.net
/
This source tree contains the daemon application only, DRing, that handles
the business logic of GNU Ring. UIs are located in differents repositories. See
...
...
@@ -79,7 +79,7 @@ make install
Done !
More details available here:
https://
tuleap.ring.cx/plugins/mediawiki/wiki/ring/index.php/Build_I
nstructions
https://
git.jami.net/savoirfairelinux/ring-project/wikis/technical/Build-i
nstructions
How to compile on OSX
...
...
@@ -169,7 +169,7 @@ Contributing to GNU Ring
Of course we love patches. And contributions. And spring rolls.
Development website / Bug Tracker:
- https://
tuleap.ring.cx/projects/ring/
- https://
git.jami.net/savoirfairelinux/ring-project
Repositories are hosted on Gerrit, which we use for code review. It also
contains the client subprojects:
...
...
astylerc
View file @
812b7b07
...
...
@@ -3,7 +3,7 @@
# http://astyle.sourceforge.net/astyle.html
# Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
# Savoir-faire Linux Inc
# https://
www.ring.cx
# https://
jami.net
style=stroustrup # stroustrup style http://astyle.sourceforge.net/astyle.html#_style=stroustrup
indent=spaces=4 # Use spaces instead of tabs for indentation
...
...
bin/main.cpp
View file @
812b7b07
...
...
@@ -53,9 +53,9 @@ static void
print_title
()
{
std
::
cout
<<
"
Ring
Daemon "
<<
DRing
::
version
()
<<
"
Jami
Daemon "
<<
DRing
::
version
()
<<
", by Savoir-faire Linux 2004-2018"
<<
std
::
endl
<<
"https://
www.ring.cx
/"
<<
std
::
endl
<<
"https://
jami.net
/"
<<
std
::
endl
#ifdef RING_VIDEO
<<
"[Video support enabled]"
<<
std
::
endl
#endif
...
...
bin/osxmain.cpp
View file @
812b7b07
...
...
@@ -44,7 +44,7 @@ print_title()
std
::
cout
<<
"Ring Daemon "
<<
DRing
::
version
()
<<
", by Savoir-faire Linux 2004-2018"
<<
std
::
endl
<<
"https://
www.ring.cx
/"
<<
std
::
endl
<<
"https://
jami.net
/"
<<
std
::
endl
#ifdef RING_VIDEO
<<
"[Video support enabled]"
<<
std
::
endl
#endif
...
...
bin/winmain.cpp
View file @
812b7b07
...
...
@@ -48,7 +48,7 @@ print_title()
std
::
cout
<<
"Ring Daemon "
<<
DRing
::
version
()
<<
", by Savoir-faire Linux 2004-2018"
<<
std
::
endl
<<
"https://
www.ring.cx
/"
<<
std
::
endl
<<
"https://
jami.net
/"
<<
std
::
endl
#ifdef RING_VIDEO
<<
"[Video support enabled]"
<<
std
::
endl
#endif
...
...
doc/README
View file @
812b7b07
This directory holds all the documentation files. This documentation
is made available online on the
ring.cx
website, as well as in other
is made available online on the
jami.net
website, as well as in other
documentation areas.
src/media/media_recorder.cpp
View file @
812b7b07
...
...
@@ -269,7 +269,7 @@ MediaRecorder::initRecord()
encoderOptions
[
"title"
]
=
title_
;
if
(
description_
.
empty
())
{
description_
=
"Recorded with
Ring https://ring.cx
"
;
description_
=
"Recorded with
Jami https://jami.net
"
;
}
description_
=
replaceAll
(
description_
,
"%TIMESTAMP"
,
timestampString
.
str
());
encoderOptions
[
"description"
]
=
description_
;
...
...
src/media/media_recorder.h
View file @
812b7b07
...
...
@@ -52,7 +52,7 @@ class MediaRecorder {
// replaces %TIMESTAMP with time at start of recording
// default title: "Conversation at %Y-%m-%d %H:%M:%S"
// default description: "Recorded with
Ring https://ring.cx
"
// default description: "Recorded with
Jami https://jami.net
"
void
setMetadata
(
const
std
::
string
&
title
,
const
std
::
string
&
desc
);
[[
deprecated
(
"use setPath to set full recording path"
)]]
...
...
src/ringdht/namedirectory.h
View file @
812b7b07
...
...
@@ -56,7 +56,7 @@ public:
private:
NON_COPYABLE
(
NameDirectory
);
NameDirectory
(
NameDirectory
&&
)
=
delete
;
constexpr
static
const
char
*
const
DEFAULT_SERVER_HOST
=
"ns.
ring.cx
"
;
constexpr
static
const
char
*
const
DEFAULT_SERVER_HOST
=
"ns.
jami.net
"
;
const
std
::
string
serverHost_
{
DEFAULT_SERVER_HOST
};
const
std
::
string
cachePath_
;
...
...
src/ringdht/p2p.cpp
View file @
812b7b07
...
...
@@ -413,7 +413,7 @@ DhtPeerConnector::Impl::turnConnect()
auto
password
=
details
[
Conf
::
CONFIG_TURN_SERVER_PWD
];
auto
turn_param_v4
=
TurnTransportParams
{};
turn_param_v4
.
server
=
IpAddr
{
server
.
empty
()
?
"turn.
ring.cx
"
:
server
};
turn_param_v4
.
server
=
IpAddr
{
server
.
empty
()
?
"turn.
jami.net
"
:
server
};
turn_param_v4
.
realm
=
realm
.
empty
()
?
"ring"
:
realm
;
turn_param_v4
.
username
=
username
.
empty
()
?
"ring"
:
username
;
turn_param_v4
.
password
=
password
.
empty
()
?
"ring"
:
password
;
...
...
src/ringdht/ringaccount.cpp
View file @
812b7b07
...
...
@@ -211,7 +211,7 @@ static constexpr auto TLS_TIMEOUT = std::chrono::seconds(30);
const
constexpr
auto
EXPORT_KEY_RENEWAL_TIME
=
std
::
chrono
::
minutes
(
20
);
static
constexpr
const
char
*
const
RING_URI_PREFIX
=
"ring:"
;
static
constexpr
const
char
*
DEFAULT_TURN_SERVER
=
"turn.
ring.cx
"
;
static
constexpr
const
char
*
DEFAULT_TURN_SERVER
=
"turn.
jami.net
"
;
static
constexpr
const
char
*
DEFAULT_TURN_USERNAME
=
"ring"
;
static
constexpr
const
char
*
DEFAULT_TURN_PWD
=
"ring"
;
static
constexpr
const
char
*
DEFAULT_TURN_REALM
=
"ring"
;
...
...
src/ringdht/ringaccount.h
View file @
812b7b07
...
...
@@ -85,8 +85,8 @@ class RingAccount : public SIPAccountBase {
public:
constexpr
static
const
char
*
const
ACCOUNT_TYPE
=
"RING"
;
constexpr
static
const
in_port_t
DHT_DEFAULT_PORT
=
4222
;
constexpr
static
const
char
*
const
DHT_DEFAULT_BOOTSTRAP
=
"bootstrap.
ring.cx
"
;
constexpr
static
const
char
*
const
DHT_DEFAULT_PROXY
=
"dhtproxy.
ring.cx
"
;
constexpr
static
const
char
*
const
DHT_DEFAULT_BOOTSTRAP
=
"bootstrap.
jami.net
"
;
constexpr
static
const
char
*
const
DHT_DEFAULT_PROXY
=
"dhtproxy.
jami.net
"
;
constexpr
static
const
char
*
const
DHT_TYPE_NS
=
"cx.ring"
;
/* constexpr */
static
const
std
::
pair
<
uint16_t
,
uint16_t
>
DHT_PORT_RANGE
;
...
...
test/turn/test_TURN.cpp
View file @
812b7b07
...
...
@@ -88,7 +88,7 @@ void
test_TURN
::
testSimpleConnection
()
{
TurnTransportParams
param
;
param
.
server
=
IpAddr
{
"turn.
ring.cx
"
};
param
.
server
=
IpAddr
{
"turn.
jami.net
"
};
param
.
realm
=
"ring"
;
param
.
username
=
"ring"
;
param
.
password
=
"ring"
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment