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

Unified Diff: webrtc/p2p/base/dtlstransportchannel.cc

Issue 2416023002: Introduce rtc::PacketTransportInterface and let cricket::TransportChannel inherit. (Closed)
Patch Set: Rebase. Created 4 years, 2 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
Index: webrtc/p2p/base/dtlstransportchannel.cc
diff --git a/webrtc/p2p/base/dtlstransportchannel.cc b/webrtc/p2p/base/dtlstransportchannel.cc
index de543d6483af6ae1d4508c7af68d1d8343b9c5bf..0fa32c8b9e222b28e70ceb8528d1d5d0c278ba00 100644
--- a/webrtc/p2p/base/dtlstransportchannel.cc
+++ b/webrtc/p2p/base/dtlstransportchannel.cc
@@ -14,6 +14,7 @@
#include "webrtc/p2p/base/dtlstransportchannel.h"
#include "webrtc/p2p/base/common.h"
+#include "webrtc/p2p/base/packettransportinterface.h"
#include "webrtc/base/buffer.h"
#include "webrtc/base/checks.h"
#include "webrtc/base/dscp.h"
@@ -437,9 +438,10 @@ bool DtlsTransportChannelWrapper::IsDtlsConnected() {
// start the DTLS handshake
// - Once the DTLS handshake completes, the state is that of the
// impl again
-void DtlsTransportChannelWrapper::OnWritableState(TransportChannel* channel) {
+void DtlsTransportChannelWrapper::OnWritableState(
+ rtc::PacketTransportInterface* transport) {
ASSERT(rtc::Thread::Current() == network_thread_);
- ASSERT(channel == channel_);
+ RTC_DCHECK(transport == channel_);
LOG_J(LS_VERBOSE, this)
<< "DTLSTransportChannelWrapper: channel writable state changed to "
<< channel_->writable();
@@ -471,7 +473,7 @@ void DtlsTransportChannelWrapper::OnWritableState(TransportChannel* channel) {
void DtlsTransportChannelWrapper::OnReceivingState(TransportChannel* channel) {
ASSERT(rtc::Thread::Current() == network_thread_);
- ASSERT(channel == channel_);
+ RTC_DCHECK(channel == channel_);
LOG_J(LS_VERBOSE, this)
<< "DTLSTransportChannelWrapper: channel receiving state changed to "
<< channel_->receiving();
@@ -482,10 +484,13 @@ void DtlsTransportChannelWrapper::OnReceivingState(TransportChannel* channel) {
}
void DtlsTransportChannelWrapper::OnReadPacket(
- TransportChannel* channel, const char* data, size_t size,
- const rtc::PacketTime& packet_time, int flags) {
+ rtc::PacketTransportInterface* transport,
+ const char* data,
+ size_t size,
+ const rtc::PacketTime& packet_time,
+ int flags) {
ASSERT(rtc::Thread::Current() == network_thread_);
- ASSERT(channel == channel_);
+ RTC_DCHECK(transport == channel_);
ASSERT(flags == 0);
if (!dtls_active_) {
@@ -558,14 +563,15 @@ void DtlsTransportChannelWrapper::OnReadPacket(
}
void DtlsTransportChannelWrapper::OnSentPacket(
- TransportChannel* channel,
+ rtc::PacketTransportInterface* transport,
const rtc::SentPacket& sent_packet) {
ASSERT(rtc::Thread::Current() == network_thread_);
SignalSentPacket(this, sent_packet);
}
-void DtlsTransportChannelWrapper::OnReadyToSend(TransportChannel* channel) {
+void DtlsTransportChannelWrapper::OnReadyToSend(
+ rtc::PacketTransportInterface* transport) {
if (writable()) {
SignalReadyToSend(this);
}

Powered by Google App Engine
This is Rietveld 408576698