diff options
Diffstat (limited to 'p2p/base/dtls_transport_internal.h')
| -rw-r--r-- | p2p/base/dtls_transport_internal.h | 41 |
1 files changed, 13 insertions, 28 deletions
diff --git a/p2p/base/dtls_transport_internal.h b/p2p/base/dtls_transport_internal.h index bd4579028c..0b26a7fd7a 100644 --- a/p2p/base/dtls_transport_internal.h +++ b/p2p/base/dtls_transport_internal.h @@ -32,22 +32,6 @@ namespace cricket { -enum DtlsTransportState { - // Haven't started negotiating. - DTLS_TRANSPORT_NEW = 0, - // Have started negotiating. - DTLS_TRANSPORT_CONNECTING, - // Negotiated, and has a secure connection. - DTLS_TRANSPORT_CONNECTED, - // Transport is closed. - DTLS_TRANSPORT_CLOSED, - // Failed due to some error in the handshake process. - DTLS_TRANSPORT_FAILED, -}; - -webrtc::DtlsTransportState ConvertDtlsTransportState( - cricket::DtlsTransportState cricket_state); - enum PacketFlags { PF_NORMAL = 0x00, // A normal packet. PF_SRTP_BYPASS = 0x01, // An encrypted SRTP packet; bypass any additional @@ -64,7 +48,7 @@ class DtlsTransportInternal : public rtc::PacketTransportInternal { public: ~DtlsTransportInternal() override; - virtual DtlsTransportState dtls_state() const = 0; + virtual webrtc::DtlsTransportState dtls_state() const = 0; virtual int component() const = 0; @@ -115,24 +99,25 @@ class DtlsTransportInternal : public rtc::PacketTransportInternal { // Expose the underneath IceTransport. virtual IceTransportInternal* ice_transport() = 0; - // F: void(DtlsTransportInternal*, const DtlsTransportState) + // F: void(DtlsTransportInternal*, const webrtc::DtlsTransportState) template <typename F> - void SubscribeDtlsState(F&& callback) { - dtls_state_callback_list_.AddReceiver(std::forward<F>(callback)); + void SubscribeDtlsTransportState(F&& callback) { + dtls_transport_state_callback_list_.AddReceiver(std::forward<F>(callback)); } template <typename F> - void SubscribeDtlsState(const void* id, F&& callback) { - dtls_state_callback_list_.AddReceiver(id, std::forward<F>(callback)); + void SubscribeDtlsTransportState(const void* id, F&& callback) { + dtls_transport_state_callback_list_.AddReceiver(id, + std::forward<F>(callback)); } // Unsubscribe the subscription with given id. - void UnsubscribeDtlsState(const void* id) { - dtls_state_callback_list_.RemoveReceivers(id); + void UnsubscribeDtlsTransportState(const void* id) { + dtls_transport_state_callback_list_.RemoveReceivers(id); } void SendDtlsState(DtlsTransportInternal* transport, - DtlsTransportState state) { - dtls_state_callback_list_.Send(transport, state); + webrtc::DtlsTransportState state) { + dtls_transport_state_callback_list_.Send(transport, state); } // Emitted whenever the Dtls handshake failed on some transport channel. @@ -153,8 +138,8 @@ class DtlsTransportInternal : public rtc::PacketTransportInternal { RTC_DISALLOW_COPY_AND_ASSIGN(DtlsTransportInternal); webrtc::CallbackList<const rtc::SSLHandshakeError> dtls_handshake_error_callback_list_; - webrtc::CallbackList<DtlsTransportInternal*, const DtlsTransportState> - dtls_state_callback_list_; + webrtc::CallbackList<DtlsTransportInternal*, const webrtc::DtlsTransportState> + dtls_transport_state_callback_list_; }; } // namespace cricket |