diff options
author | jiayl@webrtc.org <jiayl@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2014-06-10 23:54:13 +0000 |
---|---|---|
committer | jiayl@webrtc.org <jiayl@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2014-06-10 23:54:13 +0000 |
commit | c52cd4636b0f9633649ede99e28a6ab518870728 (patch) | |
tree | 194dd5155919025c0f7a96083fc45a2f3b355280 /media/sctp | |
parent | 1c1377b5979f10d87a7b8e1e2c2b929034857f3e (diff) | |
download | talk-c52cd4636b0f9633649ede99e28a6ab518870728.tar.gz |
Adds end to end DataChannel tests.
BUG=2626
R=pthatcher@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/14619004
git-svn-id: http://webrtc.googlecode.com/svn/trunk/talk@6390 4adac7df-926f-26a2-2b94-8c16560cd09d
Diffstat (limited to 'media/sctp')
-rw-r--r-- | media/sctp/sctpdataengine.cc | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/media/sctp/sctpdataengine.cc b/media/sctp/sctpdataengine.cc index 017454f..46b2ece 100644 --- a/media/sctp/sctpdataengine.cc +++ b/media/sctp/sctpdataengine.cc @@ -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| |