Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
savoirfairelinux
jami-daemon
Commits
8cef71cd
Commit
8cef71cd
authored
Sep 20, 2011
by
Rafaël Carré
Browse files
Don't let the daemon think crypto is enabled when it's not
parent
644cbad3
Changes
2
Show whitespace changes
Inline
Side-by-side
daemon/src/audio/audiortp/AudioRtpFactory.h
View file @
8cef71cd
...
...
@@ -108,15 +108,8 @@ class AudioRtpFactory
*/
void
updateDestinationIpAddress
(
void
);
/**
* @param None
* @return The internal audio rtp session type
* Symmetric = 0
* Zrtp = 1
* Sdes = 2
*/
RtpMethod
getAudioRtpType
(
void
)
const
{
return
_keyExchangeProtocol
;
bool
isSdesEnabled
(
void
)
const
{
return
_srtpEnabled
&&
_keyExchangeProtocol
==
sfl
::
Sdes
;
}
/**
...
...
daemon/src/sip/sipvoiplink.cpp
View file @
8cef71cd
...
...
@@ -1399,7 +1399,7 @@ void sdp_media_update_cb (pjsip_inv_session *inv, pj_status_t status)
// We did not found any crypto context for this media, RTP fallback
if
(
!
nego_success
&&
call
->
getAudioRtp
()
->
getAudioRtpType
()
==
sfl
::
Sdes
)
{
if
(
!
nego_success
&&
call
->
getAudioRtp
()
->
isSdesEnabled
()
)
{
call
->
getAudioRtp
()
->
stop
();
call
->
getAudioRtp
()
->
setSrtpEnabled
(
false
);
...
...
Write
Preview
Supports
Markdown
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