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
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
savoirfairelinux
jami-daemon
Commits
4c37fa33
Commit
4c37fa33
authored
4 years ago
by
Adrien Béraud
Browse files
Options
Downloads
Patches
Plain Diff
connectionmanager: cleanup
Change-Id: Ifc65f6c562fa0f41c48283621b1f7d0241d09d84
parent
8009457f
Branches
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/jamidht/connectionmanager.cpp
+2
-8
2 additions, 8 deletions
src/jamidht/connectionmanager.cpp
src/sip/sipaccount.cpp
+0
-1
0 additions, 1 deletion
src/sip/sipaccount.cpp
with
2 additions
and
9 deletions
src/jamidht/connectionmanager.cpp
+
2
−
8
View file @
4c37fa33
...
...
@@ -687,13 +687,6 @@ ConnectionManager::Impl::onDhtPeerRequest(const PeerConnectionRequest& req,
}
// Because the connection is accepted, create an ICE socket.
auto
&
iceTransportFactory
=
Manager
::
instance
().
getIceTransportFactory
();
struct
IceReady
{
std
::
mutex
mtx
{};
std
::
condition_variable
cv
{};
bool
ready
{
false
};
};
auto
ice_config
=
account
.
getIceOptions
();
ice_config
.
tcpEnable
=
true
;
ice_config
.
onInitDone
=
[
w
=
weak
(),
req
](
bool
ok
)
{
...
...
@@ -739,7 +732,8 @@ ConnectionManager::Impl::onDhtPeerRequest(const PeerConnectionRequest& req,
infos_
[{
req
.
from
,
req
.
id
}]
=
info
;
}
std
::
unique_lock
<
std
::
mutex
>
lk
{
info
->
mutex_
};
info
->
ice_
=
iceTransportFactory
.
createUTransport
(
account
.
getAccountID
().
c_str
(),
info
->
ice_
=
Manager
::
instance
()
.
getIceTransportFactory
().
createUTransport
(
account
.
getAccountID
().
c_str
(),
1
,
true
,
ice_config
);
...
...
This diff is collapsed.
Click to expand it.
src/sip/sipaccount.cpp
+
0
−
1
View file @
4c37fa33
...
...
@@ -1605,7 +1605,6 @@ SIPAccount::getHostPortFromSTUN(pj_pool_t* pool)
emitSignal
<
DRing
::
ConfigurationSignal
::
StunStatusFailed
>
(
getAccountID
());
pjsip_host_port
result
;
pj_strdup2
(
pool
,
&
result
.
host
,
addr
.
c_str
());
result
.
host
.
slen
=
addr
.
length
();
result
.
port
=
port
;
return
result
;
}
...
...
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