diff options
| author | Anton Sukhanov <sukhanov@webrtc.org> | 2019-06-03 13:00:24 -0700 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2019-06-03 22:24:12 +0000 |
| commit | 292ce4ef2569f499faa405ddde03c0a91b60a3cd (patch) | |
| tree | 6d019f68d783667e9ce121cc4b3aae22b4ee5bb9 /p2p/base/dtls_transport_internal.h | |
| parent | 9005e23a26397fe24a2a33852061168fffb9db95 (diff) | |
| download | webrtc-292ce4ef2569f499faa405ddde03c0a91b60a3cd.tar.gz | |
Move datagram transport to JsepTransport
- This makes it consistent with ICE and MediaTransport ownership.
- Removes unnecessary datagram_transport() getter in DtlsTransportInternal
As a side effect this fixes bug in JsepTransportController, which moved datagram_transport to Dtls after creating it, then checked if (datagram_transport) to decide which RTP transport to create. As a result of this bug we were creating Sded instead of Unencrypted RTP with datagram transport.
Bug: webrtc:9719
Change-Id: Ic5b13a450ce6ac5b2a20d388657e3949aabef079
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/139620
Commit-Queue: Anton Sukhanov <sukhanov@webrtc.org>
Reviewed-by: Bjorn Mellem <mellem@webrtc.org>
Reviewed-by: Steve Anton <steveanton@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#28146}
Diffstat (limited to 'p2p/base/dtls_transport_internal.h')
| -rw-r--r-- | p2p/base/dtls_transport_internal.h | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/p2p/base/dtls_transport_internal.h b/p2p/base/dtls_transport_internal.h index 16e8b8151a..07a669af2e 100644 --- a/p2p/base/dtls_transport_internal.h +++ b/p2p/base/dtls_transport_internal.h @@ -18,7 +18,6 @@ #include <string> #include "api/crypto/crypto_options.h" -#include "api/datagram_transport_interface.h" #include "api/dtls_transport_interface.h" #include "api/scoped_refptr.h" #include "p2p/base/ice_transport_internal.h" @@ -65,14 +64,6 @@ class DtlsTransportInternal : public rtc::PacketTransportInternal { virtual const webrtc::CryptoOptions& crypto_options() const = 0; - // Returns datagram transport or nullptr if not using datagram transport. - // TODO(sukhanov): Make pure virtual. - // TODO(sukhanov): Consider moving ownership of datagram transport and ICE - // to JsepTransport. - virtual webrtc::DatagramTransportInterface* datagram_transport() { - return nullptr; - } - virtual DtlsTransportState dtls_state() const = 0; virtual int component() const = 0; |