diff options
Diffstat (limited to 'webrtc/p2p/base/dtlstransportchannel.h')
| -rw-r--r-- | webrtc/p2p/base/dtlstransportchannel.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/webrtc/p2p/base/dtlstransportchannel.h b/webrtc/p2p/base/dtlstransportchannel.h index 41e081b7fe..955b963a36 100644 --- a/webrtc/p2p/base/dtlstransportchannel.h +++ b/webrtc/p2p/base/dtlstransportchannel.h @@ -126,10 +126,10 @@ class DtlsTransportChannelWrapper : public TransportChannelImpl { // Set up the ciphers to use for DTLS-SRTP. If this method is not called // before DTLS starts, or |ciphers| is empty, SRTP keys won't be negotiated. // This method should be called before SetupDtls. - bool SetSrtpCiphers(const std::vector<std::string>& ciphers) override; + bool SetSrtpCryptoSuites(const std::vector<int>& ciphers) override; // Find out which DTLS-SRTP cipher was negotiated - bool GetSrtpCryptoSuite(std::string* cipher) override; + bool GetSrtpCryptoSuite(int* cipher) override; bool GetSslRole(rtc::SSLRole* role) const override; bool SetSslRole(rtc::SSLRole role) override; @@ -216,6 +216,7 @@ class DtlsTransportChannelWrapper : public TransportChannelImpl { void OnRoleConflict(TransportChannelImpl* channel); void OnRouteChange(TransportChannel* channel, const Candidate& candidate); void OnConnectionRemoved(TransportChannelImpl* channel); + void Reconnect(); Transport* transport_; // The transport_ that created us. rtc::Thread* worker_thread_; // Everything should occur on this thread. @@ -223,7 +224,7 @@ class DtlsTransportChannelWrapper : public TransportChannelImpl { TransportChannelImpl* const channel_; rtc::scoped_ptr<rtc::SSLStreamAdapter> dtls_; // The DTLS stream StreamInterfaceChannel* downward_; // Wrapper for channel_, owned by dtls_. - std::vector<std::string> srtp_ciphers_; // SRTP ciphers to use with DTLS. + std::vector<int> srtp_ciphers_; // SRTP ciphers to use with DTLS. bool dtls_active_ = false; rtc::scoped_refptr<rtc::RTCCertificate> local_certificate_; rtc::SSLRole ssl_role_; |