Index: webrtc/media/sctp/sctptransport.h |
diff --git a/webrtc/media/sctp/sctptransport.h b/webrtc/media/sctp/sctptransport.h |
index 6d3a41a8f16092be6b9e0b9179821b286b4fd944..2f2746c48b9d2494e3e36d6784187404840f27e1 100644 |
--- a/webrtc/media/sctp/sctptransport.h |
+++ b/webrtc/media/sctp/sctptransport.h |
@@ -26,7 +26,6 @@ |
// For SendDataParams/ReceiveDataParams. |
#include "webrtc/media/base/mediachannel.h" |
#include "webrtc/media/sctp/sctptransportinternal.h" |
-#include "webrtc/p2p/base/transportchannel.h" |
// Defined by "usrsctplib/usrsctp.h" |
struct sockaddr_conn; |
@@ -59,6 +58,7 @@ struct SctpInboundPacket; |
// 12. SctpTransport::SignalDataReceived(data) |
// [from the same thread, methods registered/connected to |
// SctpTransport are called with the recieved data] |
+// TODO(zhihuang): Rename "channel" to "transport" on network-level. |
class SctpTransport : public SctpTransportInternal, |
public sigslot::has_slots<> { |
public: |
@@ -67,11 +67,11 @@ class SctpTransport : public SctpTransportInternal, |
// methods can be called. |
// |channel| is required (must not be null). |
SctpTransport(rtc::Thread* network_thread, |
- cricket::TransportChannel* channel); |
+ rtc::PacketTransportInterface* channel); |
~SctpTransport() override; |
// SctpTransportInternal overrides (see sctptransportinternal.h for comments). |
- void SetTransportChannel(cricket::TransportChannel* channel) override; |
+ void SetTransportChannel(rtc::PacketTransportInterface* channel) override; |
bool Start(int local_port, int remote_port) override; |
bool OpenStream(int sid) override; |
bool ResetStream(int sid) override; |
@@ -140,7 +140,7 @@ class SctpTransport : public SctpTransportInternal, |
// Helps pass inbound/outbound packets asynchronously to the network thread. |
rtc::AsyncInvoker invoker_; |
// Underlying DTLS channel. |
- TransportChannel* transport_channel_; |
+ rtc::PacketTransportInterface* transport_channel_; |
bool was_ever_writable_ = false; |
int local_port_ = kSctpDefaultPort; |
int remote_port_ = kSctpDefaultPort; |
@@ -179,7 +179,7 @@ class SctpTransportFactory : public SctpTransportInternalFactory { |
: network_thread_(network_thread) {} |
std::unique_ptr<SctpTransportInternal> CreateSctpTransport( |
- TransportChannel* channel) override { |
+ rtc::PacketTransportInterface* channel) override { |
return std::unique_ptr<SctpTransportInternal>( |
new SctpTransport(network_thread_, channel)); |
} |