Index: webrtc/p2p/base/dtlstransport.h |
diff --git a/webrtc/p2p/base/dtlstransportchannel.h b/webrtc/p2p/base/dtlstransport.h |
similarity index 94% |
rename from webrtc/p2p/base/dtlstransportchannel.h |
rename to webrtc/p2p/base/dtlstransport.h |
index 12b94ce032e0e89440e5b179c5ef38ccf493c0b3..4c0432c3d7d8806bf3e1d3b77cbfcfa34f20a949 100644 |
--- a/webrtc/p2p/base/dtlstransportchannel.h |
+++ b/webrtc/p2p/base/dtlstransport.h |
@@ -8,8 +8,8 @@ |
* be found in the AUTHORS file in the root of the source tree. |
*/ |
-#ifndef WEBRTC_P2P_BASE_DTLSTRANSPORTCHANNEL_H_ |
-#define WEBRTC_P2P_BASE_DTLSTRANSPORTCHANNEL_H_ |
+#ifndef WEBRTC_P2P_BASE_DTLSTRANSPORT_H_ |
+#define WEBRTC_P2P_BASE_DTLSTRANSPORT_H_ |
#include <memory> |
#include <string> |
@@ -58,7 +58,6 @@ class StreamInterfaceChannel : public rtc::StreamInterface { |
RTC_DISALLOW_COPY_AND_ASSIGN(StreamInterfaceChannel); |
}; |
- |
// This class provides a DTLS SSLStreamAdapter inside a TransportChannel-style |
// packet-based interface, wrapping an existing TransportChannel instance |
// (e.g a P2PTransportChannel) |
@@ -116,7 +115,6 @@ class DtlsTransport : public DtlsTransportInternal { |
const uint8_t* digest, |
size_t digest_len) override; |
- |
// Called to send a packet (via DTLS, if turned on). |
int SendPacket(const char* data, |
size_t size, |
@@ -152,11 +150,10 @@ class DtlsTransport : public DtlsTransportInternal { |
bool use_context, |
uint8_t* result, |
size_t result_len) override { |
- return (dtls_.get()) ? dtls_->ExportKeyingMaterial(label, context, |
- context_len, |
- use_context, |
- result, result_len) |
- : false; |
+ return (dtls_.get()) |
+ ? dtls_->ExportKeyingMaterial(label, context, context_len, |
+ use_context, result, result_len) |
+ : false; |
} |
IceTransportInternal* ice_transport() override { return ice_transport_; } |
@@ -217,7 +214,7 @@ class DtlsTransport : public DtlsTransportInternal { |
std::unique_ptr<rtc::SSLStreamAdapter> dtls_; // The DTLS stream |
StreamInterfaceChannel* |
downward_; // Wrapper for ice_transport_, owned by dtls_. |
- std::vector<int> 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_; |
@@ -239,4 +236,4 @@ class DtlsTransport : public DtlsTransportInternal { |
} // namespace cricket |
-#endif // WEBRTC_P2P_BASE_DTLSTRANSPORTCHANNEL_H_ |
+#endif // WEBRTC_P2P_BASE_DTLSTRANSPORT_H_ |