generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Properly shut down the SCTP stack.

Browse Source 
TBR phoglund@webrtc.org for the tsan_v2/suppressions.txt change.
R=ldixon@webrtc.org, pthatcher@webrtc.org
TBR=phoglund@webrtc.org
BUG=2749

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@6484 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
jiayl@webrtc.org
2014-06-18 21:30:40 +00:00
parent a19b930b5b
commit f8063d34de
6 changed files with 37 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
talk/media/sctp/sctpdataengine_unittest.cc
View File

@@ -295,7 +295,7 @@ class SctpDataMediaChannelTest : public testing::Test,
params.ssrc = ssrc;
return chan->SendData(params, talk_base::Buffer(
msg.data(), msg.length()), result);
&msg[0], msg.length()), result);
}
bool ReceivedData(const SctpFakeDataReceiver* recv, uint32 ssrc,
@@ -364,26 +364,26 @@ TEST_F(SctpDataMediaChannelTest, SendData) {
EXPECT_EQ(cricket::SDR_SUCCESS, result);
EXPECT_TRUE_WAIT(ReceivedData(receiver2(), 1, "hello?"), 1000);
LOG(LS_VERBOSE) << "recv2.received=" << receiver2()->received()
<< "recv2.last_params.ssrc="
<< ", recv2.last_params.ssrc="
<< receiver2()->last_params().ssrc
<< "recv2.last_params.timestamp="
<< ", recv2.last_params.timestamp="
<< receiver2()->last_params().ssrc
<< "recv2.last_params.seq_num="
<< ", recv2.last_params.seq_num="
<< receiver2()->last_params().seq_num
<< "recv2.last_data=" << receiver2()->last_data();
<< ", recv2.last_data=" << receiver2()->last_data();
LOG(LS_VERBOSE) << "chan2 sending: 'hi chan1' -----------------------------";
ASSERT_TRUE(SendData(channel2(), 2, "hi chan1", &result));
EXPECT_EQ(cricket::SDR_SUCCESS, result);
EXPECT_TRUE_WAIT(ReceivedData(receiver1(), 2, "hi chan1"), 1000);
LOG(LS_VERBOSE) << "recv1.received=" << receiver1()->received()
<< "recv1.last_params.ssrc="
<< ", recv1.last_params.ssrc="
<< receiver1()->last_params().ssrc
<< "recv1.last_params.timestamp="
<< ", recv1.last_params.timestamp="
<< receiver1()->last_params().ssrc
<< "recv1.last_params.seq_num="
<< ", recv1.last_params.seq_num="
<< receiver1()->last_params().seq_num
<< "recv1.last_data=" << receiver1()->last_data();
<< ", recv1.last_data=" << receiver1()->last_data();
}
// Sends a lot of large messages at once and verifies SDR_BLOCK is returned.
@@ -398,7 +398,7 @@ TEST_F(SctpDataMediaChannelTest, SendDataBlocked) {
for (size_t i = 0; i < 100; ++i) {
channel1()->SendData(
params, talk_base::Buffer(buffer.data(), buffer.size()), &result);
params, talk_base::Buffer(&buffer[0], buffer.size()), &result);
if (result == cricket::SDR_BLOCK)
break;
}