From ef48df9aeb153cc88e2314d683cfaedfdbef8a86 Mon Sep 17 00:00:00 2001 From: Zhi Huang Date: Sun, 22 Oct 2017 16:17:47 -0700 Subject: [PATCH] Fix the issues in SrtpTransport. In SrtpTransport::SetRtcpParams, send_rtcp_session_ should really call SetSend rather than SetRecv. Modified the LOG message in SrtpTransport::SetRtpParams. Bug: webrtc:8436 Change-Id: Iccbfbc5ef2d4f4ebd5f876c3f6dcc81671fdc631 Reviewed-on: https://webrtc-review.googlesource.com/14562 Reviewed-by: Taylor Brandstetter Commit-Queue: Zhi Huang Cr-Commit-Position: refs/heads/master@{#20403} --- pc/srtptransport.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pc/srtptransport.cc b/pc/srtptransport.cc index a4e99b5f3d..aa76aa2f5e 100644 --- a/pc/srtptransport.cc +++ b/pc/srtptransport.cc @@ -204,7 +204,7 @@ bool SrtpTransport::SetRtpParams(int send_cs, return false; } - LOG(LS_INFO) << "SRTP " << (new_sessions ? "updated" : "activated") + LOG(LS_INFO) << "SRTP " << (new_sessions ? "activated" : "updated") << " with negotiated parameters:" << " send cipher_suite " << send_cs << " recv cipher_suite " << recv_cs; @@ -225,7 +225,7 @@ bool SrtpTransport::SetRtcpParams(int send_cs, } send_rtcp_session_.reset(new cricket::SrtpSession()); - if (!send_rtcp_session_->SetRecv(send_cs, send_key, send_key_len)) { + if (!send_rtcp_session_->SetSend(send_cs, send_key, send_key_len)) { return false; }