Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(844)

Unified Diff: webrtc/p2p/base/dtlstransport.h

Issue 3004503002: Renamed dtlstransportchannel.h/.cc/_unittest.cc. (Closed)
Patch Set: Rename dtlstransportchannel.h/.cc/_unittest.cc. Created 3 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webrtc/p2p/BUILD.gn ('k') | webrtc/p2p/base/dtlstransport.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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_
« no previous file with comments | « webrtc/p2p/BUILD.gn ('k') | webrtc/p2p/base/dtlstransport.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698