Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
jami-daemon
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
savoirfairelinux
jami-daemon
Commits
c2e78d5f
Commit
c2e78d5f
authored
Mar 11, 2015
by
Guillaume Roguez
Committed by
Gerrit Code Review
Mar 11, 2015
Browse files
Options
Downloads
Patches
Plain Diff
OSX: doesn't build on XCode
Refs #68312 Change-Id: Ifb82dd529bf2b12f9bd2f33d03af5f45684d2749
parent
49732f87
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
daemon/src/managerimpl.cpp
+1
-4
1 addition, 4 deletions
daemon/src/managerimpl.cpp
daemon/src/managerimpl.h
+6
-0
6 additions, 0 deletions
daemon/src/managerimpl.h
daemon/src/ringdht/sips_transport_ice.cpp
+0
-4
0 additions, 4 deletions
daemon/src/ringdht/sips_transport_ice.cpp
with
7 additions
and
8 deletions
daemon/src/managerimpl.cpp
+
1
−
4
View file @
c2e78d5f
...
...
@@ -203,11 +203,8 @@ ManagerImpl::ManagerImpl() :
,
ringbufferpool_
(
new
RingBufferPool
)
,
callFactory
(),
conferenceMap_
()
,
accountFactory_
(),
ice_tf_
()
,
gnutlGIG_
{
tls
::
GnuTlsGlobalInit
::
make_guard
()}
{
#if HAVE_TLS
thread_local
static
auto
gnutlGIG
=
tls
::
GnuTlsGlobalInit
::
make_guard
();
#endif
// initialize random generator
// mt19937_64 should be seeded with 2 x 32 bits
std
::
random_device
rdev
;
...
...
This diff is collapsed.
Click to expand it.
daemon/src/managerimpl.h
+
6
−
0
View file @
c2e78d5f
...
...
@@ -68,6 +68,10 @@ class YamlParser;
class
YamlEmitter
;
}
namespace
tls
{
class
GnuTlsGlobalInit
;
}
class
PluginManager
;
class
AudioFile
;
class
DTMF
;
...
...
@@ -985,6 +989,8 @@ class ManagerImpl {
/* ICE support */
std
::
unique_ptr
<
IceTransportFactory
>
ice_tf_
;
std
::
unique_ptr
<
tls
::
GnuTlsGlobalInit
>
gnutlGIG_
;
};
}
// namespace ring
...
...
This diff is collapsed.
Click to expand it.
daemon/src/ringdht/sips_transport_ice.cpp
+
0
−
4
View file @
c2e78d5f
...
...
@@ -643,10 +643,6 @@ bool
SipsIceTransport
::
setup
()
{
RING_WARN
(
"Starting GnuTLS thread"
);
// GNU TLS library init
thread_local
static
auto
gtlsGIG
=
GnuTlsGlobalInit
::
make_guard
();
if
(
is_server_
)
{
gnutls_key_generate
(
&
cookie_key_
,
GNUTLS_COOKIE_KEY_SIZE
);
state_
=
TlsConnectionState
::
COOKIE
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment