Negotiate the same SRTP crypto suites for every DTLS association formed.

webrtc/p2p/base/transportcontroller.cc

 /*
  *  Copyright 2015 The WebRTC Project Authors. All rights reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 47 matching lines @@
   const IceTransportInternal* ice() const { return ice_.get(); }
   IceTransportInternal* ice() { return ice_.get(); }
 
  private:
   std::unique_ptr<IceTransportInternal> ice_;
   std::unique_ptr<DtlsTransportInternal> dtls_;
 
   RTC_DISALLOW_COPY_AND_ASSIGN(ChannelPair);
 };
 
-TransportController::TransportController(rtc::Thread* signaling_thread,
-                                         rtc::Thread* network_thread,
-                                         PortAllocator* port_allocator,
-                                         bool redetermine_role_on_ice_restart)
+TransportController::TransportController(
+    rtc::Thread* signaling_thread,
+    rtc::Thread* network_thread,
+    PortAllocator* port_allocator,
+    bool redetermine_role_on_ice_restart,
+    const rtc::CryptoOptions& crypto_options)
     : signaling_thread_(signaling_thread),
       network_thread_(network_thread),
       port_allocator_(port_allocator),
       redetermine_role_on_ice_restart_(redetermine_role_on_ice_restart) {}
 
-TransportController::TransportController(rtc::Thread* signaling_thread,
-                                         rtc::Thread* network_thread,
-                                         PortAllocator* port_allocator)
-    : TransportController(signaling_thread,
-                          network_thread,
-                          port_allocator,
-                          true) {}
-
 TransportController::~TransportController() {
   // Channel destructors may try to send packets, so this needs to happen on
   // the network thread.
   network_thread_->Invoke<void>(
       RTC_FROM_HERE,
       rtc::Bind(&TransportController::DestroyAllChannels_n, this));
 }
 
 bool TransportController::SetSslMaxProtocolVersion(
     rtc::SSLProtocolVersion version) {
@@ skipping 260 matching lines @@
 IceTransportInternal* TransportController::CreateIceTransportChannel_n(
     const std::string& transport_name,
     int component) {
   return new P2PTransportChannel(transport_name, component, port_allocator_);
 }
 
 DtlsTransportInternal* TransportController::CreateDtlsTransportChannel_n(
     const std::string&,
     int,
     IceTransportInternal* ice) {
-  DtlsTransport* dtls = new DtlsTransport(ice);
+  DtlsTransport* dtls = new DtlsTransport(ice, crypto_options_);
   dtls->SetSslMaxProtocolVersion(ssl_max_version_);
   return dtls;
 }
 
 void TransportController::OnMessage(rtc::Message* pmsg) {
   RTC_DCHECK(signaling_thread_->IsCurrent());
 
   switch (pmsg->message_id) {
     case MSG_ICECONNECTIONSTATE: {
       rtc::TypedMessageData<IceConnectionState>* data =
@@ skipping 507 matching lines @@
         RTC_FROM_HERE, this, MSG_ICEGATHERINGSTATE,
         new rtc::TypedMessageData<IceGatheringState>(new_gathering_state));
   }
 }
 
 void TransportController::OnDtlsHandshakeError(rtc::SSLHandshakeError error) {
   SignalDtlsHandshakeError(error);
 }
 
 }  // namespace cricket