generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

(Auto)update libjingle 73370064-> 73399579

Browse Source 
git-svn-id: http://webrtc.googlecode.com/svn/trunk@6911 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
buildbot@webrtc.org 2014-08-15 18:26:12 +00:00
parent fb1eb43377
commit 353cd37ae9
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
talk/p2p/base/dtlstransportchannel.cc
View File

@ -298,6 +298,11 @@ bool DtlsTransportChannelWrapper::SetSrtpCiphers(
if (srtp_ciphers_ == ciphers) if (srtp_ciphers_ == ciphers)
return true; return true;
if (dtls_state_ == STATE_STARTED) {
LOG(LS_WARNING) << "Ignoring new SRTP ciphers while DTLS is negotiating";
return true;
}
if (dtls_state_ == STATE_OPEN) { if (dtls_state_ == STATE_OPEN) {
// We don't support DTLS renegotiation currently. If new set of srtp ciphers // We don't support DTLS renegotiation currently. If new set of srtp ciphers
// are different than what's being used currently, we will not use it. // are different than what's being used currently, we will not use it.