Backed out changeset 5970fced4222 (bug 1118398) for zmedia failures on a CLOSED TREE

This commit is contained in:
Wes Kocher 2015-01-21 18:17:56 -08:00
parent 034f782be0
commit 158e29116c

View File

@ -1766,12 +1766,12 @@ DataChannelConnection::HandleStreamResetEvent(const struct sctp_stream_reset_eve
channel->mState == DataChannel::WAITING_TO_OPEN);
if (channel->mState == DataChannel::OPEN ||
channel->mState == DataChannel::WAITING_TO_OPEN) {
// Mark the stream for reset (the reset is sent below)
ResetOutgoingStream(channel->mStream);
SendOutgoingStreamReset();
NS_DispatchToMainThread(new DataChannelOnMessageAvailable(
DataChannelOnMessageAvailable::ON_CHANNEL_CLOSED, this,
channel));
}
NS_DispatchToMainThread(new DataChannelOnMessageAvailable(
DataChannelOnMessageAvailable::ON_CHANNEL_CLOSED, this,
channel));
mStreams[channel->mStream] = nullptr;
LOG(("Disconnected DataChannel %p from connection %p",
@ -1785,7 +1785,7 @@ DataChannelConnection::HandleStreamResetEvent(const struct sctp_stream_reset_eve
}
}
// Process any pending resets now:
// In case we failed to send a RESET due to having one outstanding, process any pending resets now:
if (!mStreamsResetting.IsEmpty()) {
LOG(("Sending %d pending resets", mStreamsResetting.Length()));
SendOutgoingStreamReset();