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
08313117
Commit
08313117
authored
Dec 20, 2022
by
Adrien Béraud
Committed by
Sébastien Blin
Dec 27, 2022
Browse files
Options
Downloads
Patches
Plain Diff
misc: fix warnings
Change-Id: I00b36436c2b4ab55ff4107222cf40f194c0b0610
parent
8ef3f944
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/connectivity/turn_cache.cpp
+2
-2
2 additions, 2 deletions
src/connectivity/turn_cache.cpp
src/jamidht/jamiaccount.cpp
+2
-2
2 additions, 2 deletions
src/jamidht/jamiaccount.cpp
with
4 additions
and
4 deletions
src/connectivity/turn_cache.cpp
+
2
−
2
View file @
08313117
...
@@ -174,7 +174,7 @@ TurnCache::testTurn(IpAddr server)
...
@@ -174,7 +174,7 @@ TurnCache::testTurn(IpAddr server)
turn
.
reset
();
// Stop previous TURN
turn
.
reset
();
// Stop previous TURN
try
{
try
{
turn
=
std
::
make_unique
<
TurnTransport
>
(
turn
=
std
::
make_unique
<
TurnTransport
>
(
params
,
std
::
move
(
[
this
,
server
](
bool
ok
)
{
params
,
[
this
,
server
](
bool
ok
)
{
// Stop server in an async job, because this callback can be called
// Stop server in an async job, because this callback can be called
// immediately and cachedTurnMutex_ must not be locked.
// immediately and cachedTurnMutex_ must not be locked.
std
::
lock_guard
<
std
::
mutex
>
lock
(
shutdownMtx_
);
std
::
lock_guard
<
std
::
mutex
>
lock
(
shutdownMtx_
);
...
@@ -182,7 +182,7 @@ TurnCache::testTurn(IpAddr server)
...
@@ -182,7 +182,7 @@ TurnCache::testTurn(IpAddr server)
onConnectedTimer_
->
expires_at
(
std
::
chrono
::
steady_clock
::
now
());
onConnectedTimer_
->
expires_at
(
std
::
chrono
::
steady_clock
::
now
());
onConnectedTimer_
->
async_wait
(
std
::
bind
(
&
TurnCache
::
onConnected
,
shared_from_this
(),
std
::
placeholders
::
_1
,
ok
,
server
));
onConnectedTimer_
->
async_wait
(
std
::
bind
(
&
TurnCache
::
onConnected
,
shared_from_this
(),
std
::
placeholders
::
_1
,
ok
,
server
));
}
}
})
)
;
});
}
catch
(
const
std
::
exception
&
e
)
{
}
catch
(
const
std
::
exception
&
e
)
{
JAMI_ERROR
(
"TurnTransport creation error: {}"
,
e
.
what
());
JAMI_ERROR
(
"TurnTransport creation error: {}"
,
e
.
what
());
}
}
...
...
This diff is collapsed.
Click to expand it.
src/jamidht/jamiaccount.cpp
+
2
−
2
View file @
08313117
...
@@ -458,7 +458,7 @@ JamiAccount::newSwarmOutgoingCallHelper(const std::shared_ptr<SIPCall>& call, co
...
@@ -458,7 +458,7 @@ JamiAccount::newSwarmOutgoingCallHelper(const std::shared_ptr<SIPCall>& call, co
convModule
()
->
call
(
convModule
()
->
call
(
uri
.
authority
(),
uri
.
authority
(),
call
,
call
,
std
::
move
(
[
this
,
uri
,
call
](
const
std
::
string
&
accountUri
,
const
DeviceId
&
deviceId
)
{
[
this
,
uri
,
call
](
const
std
::
string
&
accountUri
,
const
DeviceId
&
deviceId
)
{
std
::
unique_lock
<
std
::
mutex
>
lkSipConn
(
sipConnsMtx_
);
std
::
unique_lock
<
std
::
mutex
>
lkSipConn
(
sipConnsMtx_
);
for
(
auto
&
[
key
,
value
]
:
sipConns_
)
{
for
(
auto
&
[
key
,
value
]
:
sipConns_
)
{
if
(
key
.
first
!=
accountUri
||
key
.
second
!=
deviceId
)
if
(
key
.
first
!=
accountUri
||
key
.
second
!=
deviceId
)
...
@@ -502,7 +502,7 @@ JamiAccount::newSwarmOutgoingCallHelper(const std::shared_ptr<SIPCall>& call, co
...
@@ -502,7 +502,7 @@ JamiAccount::newSwarmOutgoingCallHelper(const std::shared_ptr<SIPCall>& call, co
JAMI_WARN
(
"[call %s] No channeled socket with this peer. Send request"
,
JAMI_WARN
(
"[call %s] No channeled socket with this peer. Send request"
,
call
->
getCallId
().
c_str
());
call
->
getCallId
().
c_str
());
requestSIPConnection
(
accountUri
,
deviceId
,
type
,
true
,
call
);
requestSIPConnection
(
accountUri
,
deviceId
,
type
,
true
,
call
);
})
)
;
});
}
}
void
void
...
...
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