diff options
Diffstat (limited to 'webrtc/p2p/base/transportcontroller.h')
| -rw-r--r-- | webrtc/p2p/base/transportcontroller.h | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/webrtc/p2p/base/transportcontroller.h b/webrtc/p2p/base/transportcontroller.h index 8d57b460e8..450e6b391f 100644 --- a/webrtc/p2p/base/transportcontroller.h +++ b/webrtc/p2p/base/transportcontroller.h @@ -48,11 +48,7 @@ class TransportController : public sigslot::has_slots<>, void SetIceConfig(const IceConfig& config); void SetIceRole(IceRole ice_role); - // TODO(deadbeef) - Return role of each transport, as role may differ from - // one another. - // In current implementaion we just return the role of the first transport - // alphabetically. - bool GetSslRole(rtc::SSLRole* role); + bool GetSslRole(const std::string& transport_name, rtc::SSLRole* role); // Specifies the identity to use in this session. // Can only be called once. @@ -160,7 +156,7 @@ class TransportController : public sigslot::has_slots<>, bool SetSslMaxProtocolVersion_w(rtc::SSLProtocolVersion version); void SetIceConfig_w(const IceConfig& config); void SetIceRole_w(IceRole ice_role); - bool GetSslRole_w(rtc::SSLRole* role); + bool GetSslRole_w(const std::string& transport_name, rtc::SSLRole* role); bool SetLocalCertificate_w( const rtc::scoped_refptr<rtc::RTCCertificate>& certificate); bool GetLocalCertificate_w( @@ -202,7 +198,7 @@ class TransportController : public sigslot::has_slots<>, std::vector<RefCountedChannel> channels_; PortAllocator* const port_allocator_ = nullptr; - rtc::SSLProtocolVersion ssl_max_version_ = rtc::SSL_PROTOCOL_DTLS_10; + rtc::SSLProtocolVersion ssl_max_version_ = rtc::SSL_PROTOCOL_DTLS_12; // Aggregate state for TransportChannelImpls. IceConnectionState connection_state_ = kIceConnectionConnecting; |