mollyim/webrtc
1
0
Fork 0
mirror of https://github.com/mollyim/webrtc.git synced 2025-05-13 05:40:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

pc: Close the data channel association after sending messages in closing state

Browse source 
After we're done sending all the messages, if the channel was in closing
state, then we start closing the association at the SCTP level, which
allows transitioning to the closed state.

Bug: chromium:40072842
Change-Id: I81b26b4137593b8feeb4bd9a2563cdfd67e1049e
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/344421
Commit-Queue: Victor Boivie <boivie@webrtc.org>
Reviewed-by: Victor Boivie <boivie@webrtc.org>
Auto-Submit: Florent Castelli <orphis@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#41962}
This commit is contained in:
Florent Castelli 2024-03-25 16:01:12 +00:00 committed by WebRTC LUCI CQ
parent ff7a557f2e
commit 5928e35abf
2 changed files with 57 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
pc/data_channel_integrationtest.cc
View file

@ -253,6 +253,57 @@ TEST_P(DataChannelIntegrationTest,
EXPECT_EQ_WAIT(data, caller()->data_observer()->last_message(),
kDefaultTimeout);
}
caller()->data_channel()->Close();
EXPECT_EQ_WAIT(caller()->data_observer()->state(),
webrtc::DataChannelInterface::kClosed, kDefaultTimeout);
EXPECT_EQ_WAIT(callee()->data_observer()->state(),
webrtc::DataChannelInterface::kClosed, kDefaultTimeout);
}
// This test sets up a call between two parties with an SCTP
// data channel only, and sends enough messages to fill the queue and then
// closes on the caller. We expect the state to transition to closed on both
// caller and callee.
TEST_P(DataChannelIntegrationTest, EndToEndCallWithSctpDataChannelFullBuffer) {
ASSERT_TRUE(CreatePeerConnectionWrappers());
ConnectFakeSignaling();
// Expect that data channel created on caller side will show up for callee as
// well.
caller()->CreateDataChannel();
caller()->CreateAndSetAndSignalOffer();
ASSERT_TRUE_WAIT(SignalingStateStable(), kDefaultTimeout);
// Caller data channel should already exist (it created one). Callee data
// channel may not exist yet, since negotiation happens in-band, not in SDP.
ASSERT_NE(nullptr, caller()->data_channel());
ASSERT_TRUE_WAIT(callee()->data_channel() != nullptr, kDefaultTimeout);
EXPECT_TRUE_WAIT(caller()->data_observer()->IsOpen(), kDefaultTimeout);
EXPECT_TRUE_WAIT(callee()->data_observer()->IsOpen(), kDefaultTimeout);
std::string data(256 * 1024, 'a');
for (size_t queued_size = 0;
queued_size < webrtc::DataChannelInterface::MaxSendQueueSize();
queued_size += data.size()) {
caller()->data_channel()->SendAsync(DataBuffer(data), nullptr);
}
caller()->data_channel()->Close();
DataChannelInterface::DataState expected_states[] = {
DataChannelInterface::DataState::kConnecting,
DataChannelInterface::DataState::kOpen,
DataChannelInterface::DataState::kClosing,
DataChannelInterface::DataState::kClosed};
EXPECT_EQ_WAIT(DataChannelInterface::DataState::kClosed,
caller()->data_observer()->state(), kDefaultTimeout);
EXPECT_THAT(caller()->data_observer()->states(),
::testing::ElementsAreArray(expected_states));
EXPECT_EQ_WAIT(DataChannelInterface::DataState::kClosed,
callee()->data_observer()->state(), kDefaultTimeout);
EXPECT_THAT(callee()->data_observer()->states(),
::testing::ElementsAreArray(expected_states));
}
// This test sets up a call between two parties with an SCTP

6
pc/sctp_data_channel.cc
View file

@ -663,6 +663,12 @@ void SctpDataChannel::OnTransportChannelClosed(RTCError error) {
void SctpDataChannel::OnBufferedAmountLow() {
RTC_DCHECK_RUN_ON(network_thread_);
MaybeSendOnBufferedAmountChanged();
if (state_ == DataChannelInterface::kClosing && !started_closing_procedure_ &&
id_n_.has_value() && buffered_amount() == 0) {
started_closing_procedure_ = true;
controller_->RemoveSctpDataStream(*id_n_);
}
}
DataChannelStats SctpDataChannel::GetStats() const {