zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert r6420 'Revert r6390 "Adds end to end DataChannel tests." Flaky on linux_memcheck'

Browse Source 
Failing tests are disabled for memcheck.

TBR=wu@webrtc.org
BUG=2626

Review URL: https://webrtc-codereview.appspot.com/13699004

Review URL: https://webrtc-codereview.appspot.com/13699004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@6422 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
jiayl@webrtc.org
2014-06-12 21:59:29 +00:00
parent 3c13ed3b93
commit 1a6c6281ca
6 changed files with 224 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
talk/media/sctp/sctpdataengine.cc
View File

@ -781,7 +781,6 @@ void SctpDataMediaChannel::OnStreamResetEvent(
<< ListStreams(open_streams_) << "], Q'd: ["
<< ListStreams(queued_reset_streams_) << "], Sent: ["
<< ListStreams(sent_reset_streams_) << "]";
bool local_stream_reset_acknowledged = false;
// If both sides try to reset some streams at the same time (even if they're
// disjoint sets), we can get reset failures.
@ -792,7 +791,6 @@ void SctpDataMediaChannel::OnStreamResetEvent(
sent_reset_streams_.begin(),
sent_reset_streams_.end());
sent_reset_streams_.clear();
local_stream_reset_acknowledged = true;
} else if (evt->strreset_flags & SCTP_STREAM_RESET_INCOMING_SSN) {
// Each side gets an event for each direction of a stream. That is,
@ -809,7 +807,6 @@ void SctpDataMediaChannel::OnStreamResetEvent(
if (it != sent_reset_streams_.end()) {
LOG(LS_VERBOSE) << "SCTP_STREAM_RESET_EVENT(" << debug_name_
<< "): local sid " << stream_id << " acknowledged.";
local_stream_reset_acknowledged = true;
sent_reset_streams_.erase(it);
} else if ((it = open_streams_.find(stream_id))
@ -840,11 +837,9 @@ void SctpDataMediaChannel::OnStreamResetEvent(
}
}
if (local_stream_reset_acknowledged) {
// This message acknowledges the last stream-reset request we sent out
// (only one can be outstanding at a time). Send out the next one.
SendQueuedStreamResets();
}
// Always try to send the queued RESET because this call indicates that the
// last local RESET or remote RESET has made some progress.
SendQueuedStreamResets();
}
// Puts the specified |param| from the codec identified by |id| into |dest|