jami/jami-daemon
1
0
Fork 0
mirror of https://git.jami.net/savoirfairelinux/jami-daemon.git synced 2025-08-07 22:02:12 +08:00
Code Issues Projects Releases Wiki Activity

[#1744] Put SRTP call on hold when SDES activated

Browse Source
This commit is contained in:
Alexandre Savard
2010-02-04 16:38:05 -05:00
parent fb20338f79
commit cad9bf1023
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sflphone-common/src/audio/audiortp/AudioRtpFactory.cpp
View File

@ -222,7 +222,7 @@ sfl::AudioZrtpSession * AudioRtpFactory::getAudioZrtpSession()
void AudioRtpFactory::setRemoteCryptoInfo(sfl::SdesNegotiator& nego)
{
if ( (_rtpSessionType != NULL) && (_rtpSessionType == Sdes)) {
if ( _rtpSession && _rtpSessionType && (_rtpSessionType == Sdes)) {
static_cast<AudioSrtpSession *> (_rtpSession)->setRemoteCryptoInfo(nego);
}
else {

12
sflphone-common/src/sip/sipvoiplink.cpp
View File

@ -2571,6 +2571,8 @@ pj_status_t SIPVoIPLink::createTlsTransport(const AccountID& accountID, std::str
{
pj_status_t success;
_debug("Create TLS transport for account %s\n", accountID.c_str());
// Retrieve the account information
SIPAccount * account = dynamic_cast<SIPAccount *> (Manager::instance().getAccount (accountID));
@ -3184,10 +3186,12 @@ void call_on_media_update (pjsip_inv_session *inv, pj_status_t status)
_debug("SDES negociation successfull \n");
nego_success = true;
if(call->getAudioRtp()->getAudioRtpType() == sfl::Sdes) {
_debug("Set remote cryptographic context\n");
call->getAudioRtp()->setRemoteCryptoInfo(sdesnego);
}
_debug("Set remote cryptographic context\n");
try {
call->getAudioRtp()->setRemoteCryptoInfo(sdesnego);
}
catch(...) {}
}
else {