Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(311)

Unified Diff: webrtc/ortc/rtptransportadapter.cc

Issue 2714813004: Create the SrtpTransportInterface. (Closed)
Patch Set: Use rtc::Optional for SRTP send and receive keys. Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webrtc/ortc/rtptransportadapter.h ('k') | webrtc/ortc/rtptransportcontrolleradapter.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/ortc/rtptransportadapter.cc
diff --git a/webrtc/ortc/rtptransportadapter.cc b/webrtc/ortc/rtptransportadapter.cc
index 439f9a83b450efc757b9f2e9a77b8d161dbc8b70..3982f2d5f796d7c55ab45f22157f1f04fa9287f1 100644
--- a/webrtc/ortc/rtptransportadapter.cc
+++ b/webrtc/ortc/rtptransportadapter.cc
@@ -32,6 +32,20 @@ RtpTransportAdapter* GetInternal() override {
}
END_PROXY_MAP()
+BEGIN_OWNED_PROXY_MAP(SrtpTransport)
+PROXY_SIGNALING_THREAD_DESTRUCTOR()
+PROXY_CONSTMETHOD0(PacketTransportInterface*, GetRtpPacketTransport)
+PROXY_CONSTMETHOD0(PacketTransportInterface*, GetRtcpPacketTransport)
+PROXY_METHOD1(RTCError, SetRtcpParameters, const RtcpParameters&)
+PROXY_CONSTMETHOD0(RtcpParameters, GetRtcpParameters)
+PROXY_METHOD1(RTCError, SetSrtpSendKey, const cricket::CryptoParams&)
+PROXY_METHOD1(RTCError, SetSrtpReceiveKey, const cricket::CryptoParams&)
+protected:
+RtpTransportAdapter* GetInternal() override {
+ return internal();
+}
+END_PROXY_MAP()
+
// static
RTCErrorOr<std::unique_ptr<RtpTransportInterface>>
RtpTransportAdapter::CreateProxied(
@@ -64,7 +78,43 @@ RtpTransportAdapter::CreateProxied(
rtp_transport_controller->signaling_thread(),
rtp_transport_controller->worker_thread(),
std::unique_ptr<RtpTransportAdapter>(new RtpTransportAdapter(
- rtcp_parameters, rtp, rtcp, rtp_transport_controller)));
+ rtcp_parameters, rtp, rtcp, rtp_transport_controller,
+ /*is_srtp_transport*/ false)));
+}
+
+RTCErrorOr<std::unique_ptr<SrtpTransportInterface>>
+RtpTransportAdapter::CreateSrtpProxied(
+ const RtcpParameters& rtcp_parameters,
+ PacketTransportInterface* rtp,
+ PacketTransportInterface* rtcp,
+ RtpTransportControllerAdapter* rtp_transport_controller) {
+ if (!rtp) {
+ LOG_AND_RETURN_ERROR(RTCErrorType::INVALID_PARAMETER,
+ "Must provide an RTP packet transport.");
+ }
+ if (!rtcp_parameters.mux && !rtcp) {
+ LOG_AND_RETURN_ERROR(
+ RTCErrorType::INVALID_PARAMETER,
+ "Must provide an RTCP packet transport when RTCP muxing is not used.");
+ }
+ if (rtcp_parameters.mux && rtcp) {
+ LOG_AND_RETURN_ERROR(RTCErrorType::INVALID_PARAMETER,
+ "Creating an RtpTransport with RTCP muxing enabled, "
+ "with a separate RTCP packet transport?");
+ }
+ if (!rtp_transport_controller) {
+ // Since OrtcFactory::CreateRtpTransport creates an RtpTransportController
+ // automatically when one isn't passed in, this should never be reached.
+ RTC_NOTREACHED();
+ LOG_AND_RETURN_ERROR(RTCErrorType::INVALID_PARAMETER,
+ "Must provide an RTP transport controller.");
+ }
+ return SrtpTransportProxyWithInternal<RtpTransportAdapter>::Create(
+ rtp_transport_controller->signaling_thread(),
+ rtp_transport_controller->worker_thread(),
+ std::unique_ptr<RtpTransportAdapter>(new RtpTransportAdapter(
+ rtcp_parameters, rtp, rtcp, rtp_transport_controller,
+ /*is_srtp_transport*/ true)));
}
void RtpTransportAdapter::TakeOwnershipOfRtpTransportController(
@@ -78,11 +128,13 @@ RtpTransportAdapter::RtpTransportAdapter(
const RtcpParameters& rtcp_parameters,
PacketTransportInterface* rtp,
PacketTransportInterface* rtcp,
- RtpTransportControllerAdapter* rtp_transport_controller)
+ RtpTransportControllerAdapter* rtp_transport_controller,
+ bool is_srtp_transport)
: rtp_packet_transport_(rtp),
rtcp_packet_transport_(rtcp),
rtp_transport_controller_(rtp_transport_controller),
- rtcp_parameters_(rtcp_parameters) {
+ rtcp_parameters_(rtcp_parameters),
+ is_srtp_transport_(is_srtp_transport) {
RTC_DCHECK(rtp_transport_controller);
// CNAME should have been filled by OrtcFactory if empty.
RTC_DCHECK(!rtcp_parameters_.cname.empty());
@@ -126,4 +178,36 @@ RTCError RtpTransportAdapter::SetRtcpParameters(
return RTCError::OK();
}
+RTCError RtpTransportAdapter::SetSrtpSendKey(
+ const cricket::CryptoParams& params) {
+ if (send_key_) {
+ LOG_AND_RETURN_ERROR(
+ webrtc::RTCErrorType::UNSUPPORTED_OPERATION,
+ "Setting the SRTP send key twice is currently unsupported.");
+ }
+ if (receive_key_ && receive_key_->cipher_suite != params.cipher_suite) {
+ LOG_AND_RETURN_ERROR(
+ webrtc::RTCErrorType::UNSUPPORTED_OPERATION,
+ "The send key and receive key must have the same cipher suite.");
+ }
+ send_key_ = rtc::Optional<cricket::CryptoParams>(params);
+ return RTCError::OK();
+}
+
+RTCError RtpTransportAdapter::SetSrtpReceiveKey(
+ const cricket::CryptoParams& params) {
+ if (receive_key_) {
+ LOG_AND_RETURN_ERROR(
+ webrtc::RTCErrorType::UNSUPPORTED_OPERATION,
+ "Setting the SRTP receive key twice is currently unsupported.");
+ }
+ if (send_key_ && send_key_->cipher_suite != params.cipher_suite) {
+ LOG_AND_RETURN_ERROR(
+ webrtc::RTCErrorType::UNSUPPORTED_OPERATION,
+ "The send key and receive key must have the same cipher suite.");
+ }
+ receive_key_ = rtc::Optional<cricket::CryptoParams>(params);
+ return RTCError::OK();
+}
+
} // namespace webrtc
« no previous file with comments | « webrtc/ortc/rtptransportadapter.h ('k') | webrtc/ortc/rtptransportcontrolleradapter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698