mirror of
https://github.com/mollyim/webrtc.git
synced 2025-05-17 15:47:53 +01:00
fc604aa990
This fixes a DCHECK during teardown in the case when the primary DataChannelTranspot (eg. DatagramTransport) is successfully negotiated. DatagramTransport expects the DataSink to be unset before it's deleted. This was not caught by existing tests because the fallback transport (SctpDataChannelTransport) does not have the same DCHECK. Also adds a regression test for the issue, in which SCTP is available as a fallback but DataChannelTransport is negotiated successfully. Bug: webrtc:9719 Change-Id: I414d964d3c85d3d01cdb5e34d6b248659a613c39 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/154365 Commit-Queue: Bjorn Mellem <mellem@webrtc.org> Reviewed-by: Seth Hampson <shampson@webrtc.org> Cr-Commit-Position: refs/heads/master@{#29292}
123 lines
3.5 KiB
C++
123 lines
3.5 KiB
C++
/*
|
|
* Copyright 2019 The WebRTC Project Authors. All rights reserved.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license
|
|
* that can be found in the LICENSE file in the root of the source
|
|
* tree. An additional intellectual property rights grant can be found
|
|
* in the file PATENTS. All contributing project authors may
|
|
* be found in the AUTHORS file in the root of the source tree.
|
|
*/
|
|
|
|
#include "pc/composite_data_channel_transport.h"
|
|
|
|
#include <utility>
|
|
|
|
#include "absl/algorithm/container.h"
|
|
|
|
namespace webrtc {
|
|
|
|
CompositeDataChannelTransport::CompositeDataChannelTransport(
|
|
std::vector<DataChannelTransportInterface*> transports)
|
|
: transports_(std::move(transports)) {
|
|
for (auto transport : transports_) {
|
|
transport->SetDataSink(this);
|
|
}
|
|
}
|
|
|
|
CompositeDataChannelTransport::~CompositeDataChannelTransport() {
|
|
for (auto transport : transports_) {
|
|
transport->SetDataSink(nullptr);
|
|
}
|
|
}
|
|
|
|
void CompositeDataChannelTransport::SetSendTransport(
|
|
DataChannelTransportInterface* send_transport) {
|
|
if (!absl::c_linear_search(transports_, send_transport)) {
|
|
return;
|
|
}
|
|
send_transport_ = send_transport;
|
|
// NB: OnReadyToSend() checks if we're actually ready to send, and signals
|
|
// |sink_| if appropriate. This signal is required upon setting the sink.
|
|
OnReadyToSend();
|
|
}
|
|
|
|
void CompositeDataChannelTransport::RemoveTransport(
|
|
DataChannelTransportInterface* transport) {
|
|
RTC_DCHECK(transport != send_transport_) << "Cannot remove send transport";
|
|
|
|
auto it = absl::c_find(transports_, transport);
|
|
if (it == transports_.end()) {
|
|
return;
|
|
}
|
|
|
|
transport->SetDataSink(nullptr);
|
|
transports_.erase(it);
|
|
}
|
|
|
|
RTCError CompositeDataChannelTransport::OpenChannel(int channel_id) {
|
|
RTCError error = RTCError::OK();
|
|
for (auto transport : transports_) {
|
|
RTCError e = transport->OpenChannel(channel_id);
|
|
if (!e.ok()) {
|
|
error = std::move(e);
|
|
}
|
|
}
|
|
return error;
|
|
}
|
|
|
|
RTCError CompositeDataChannelTransport::SendData(
|
|
int channel_id,
|
|
const SendDataParams& params,
|
|
const rtc::CopyOnWriteBuffer& buffer) {
|
|
if (send_transport_) {
|
|
return send_transport_->SendData(channel_id, params, buffer);
|
|
}
|
|
return RTCError(RTCErrorType::NETWORK_ERROR, "Send transport is not ready");
|
|
}
|
|
|
|
RTCError CompositeDataChannelTransport::CloseChannel(int channel_id) {
|
|
if (send_transport_) {
|
|
return send_transport_->CloseChannel(channel_id);
|
|
}
|
|
return RTCError(RTCErrorType::NETWORK_ERROR, "Send transport is not ready");
|
|
}
|
|
|
|
void CompositeDataChannelTransport::SetDataSink(DataChannelSink* sink) {
|
|
sink_ = sink;
|
|
// NB: OnReadyToSend() checks if we're actually ready to send, and signals
|
|
// |sink_| if appropriate. This signal is required upon setting the sink.
|
|
OnReadyToSend();
|
|
}
|
|
|
|
bool CompositeDataChannelTransport::IsReadyToSend() const {
|
|
return send_transport_ && send_transport_->IsReadyToSend();
|
|
}
|
|
|
|
void CompositeDataChannelTransport::OnDataReceived(
|
|
int channel_id,
|
|
DataMessageType type,
|
|
const rtc::CopyOnWriteBuffer& buffer) {
|
|
if (sink_) {
|
|
sink_->OnDataReceived(channel_id, type, buffer);
|
|
}
|
|
}
|
|
|
|
void CompositeDataChannelTransport::OnChannelClosing(int channel_id) {
|
|
if (sink_) {
|
|
sink_->OnChannelClosing(channel_id);
|
|
}
|
|
}
|
|
|
|
void CompositeDataChannelTransport::OnChannelClosed(int channel_id) {
|
|
if (sink_) {
|
|
sink_->OnChannelClosed(channel_id);
|
|
}
|
|
}
|
|
|
|
void CompositeDataChannelTransport::OnReadyToSend() {
|
|
if (sink_ && send_transport_ && send_transport_->IsReadyToSend()) {
|
|
sink_->OnReadyToSend();
|
|
}
|
|
}
|
|
|
|
} // namespace webrtc
|