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

Fix an issue in MediaStreamSignaling that a remotely create DataChannel is added to the list twice.

Browse Source 
BUG=3778
R=pthatcher@webrtc.org

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@7073 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
jiayl@webrtc.org 2014-09-05 00:01:12 +00:00
parent f1427c6731
commit dfbcf8161e
2 changed files with 37 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
talk/app/webrtc/mediastreamsignaling.cc
View File

@ -326,12 +326,13 @@ bool MediaStreamSignaling::AddDataChannelFromOpenMessage(
LOG(LS_ERROR) << "Failed to create DataChannel from the OPEN message."; LOG(LS_ERROR) << "Failed to create DataChannel from the OPEN message.";
return false; return false;
} }
sctp_data_channels_.push_back(channel);
stream_observer_->OnAddDataChannel(channel); stream_observer_->OnAddDataChannel(channel);
return true; return true;
} }
void MediaStreamSignaling::RemoveSctpDataChannel(int sid) { void MediaStreamSignaling::RemoveSctpDataChannel(int sid) {
ASSERT(sid >= 0);
for (SctpDataChannels::iterator iter = sctp_data_channels_.begin(); for (SctpDataChannels::iterator iter = sctp_data_channels_.begin();
iter != sctp_data_channels_.end(); iter != sctp_data_channels_.end();
++iter) { ++iter) {

40
talk/app/webrtc/mediastreamsignaling_unittest.cc
View File

@ -261,14 +261,20 @@ static bool CompareStreamCollections(StreamCollectionInterface* s1,
class FakeDataChannelFactory : public webrtc::DataChannelFactory { class FakeDataChannelFactory : public webrtc::DataChannelFactory {
public: public:
FakeDataChannelFactory(FakeDataChannelProvider* provider, FakeDataChannelFactory(FakeDataChannelProvider* provider,
cricket::DataChannelType dct) cricket::DataChannelType dct,
: provider_(provider), type_(dct) {} webrtc::MediaStreamSignaling* media_stream_signaling)
: provider_(provider),
type_(dct),
media_stream_signaling_(media_stream_signaling) {}
virtual rtc::scoped_refptr<webrtc::DataChannel> CreateDataChannel( virtual rtc::scoped_refptr<webrtc::DataChannel> CreateDataChannel(
const std::string& label, const std::string& label,
const webrtc::InternalDataChannelInit* config) { const webrtc::InternalDataChannelInit* config) {
last_init_ = *config; last_init_ = *config;
return webrtc::DataChannel::Create(provider_, type_, label, *config); rtc::scoped_refptr<webrtc::DataChannel> data_channel =
webrtc::DataChannel::Create(provider_, type_, label, *config);
media_stream_signaling_->AddDataChannel(data_channel);
return data_channel;
} }
const webrtc::InternalDataChannelInit& last_init() const { const webrtc::InternalDataChannelInit& last_init() const {
@ -278,6 +284,7 @@ class FakeDataChannelFactory : public webrtc::DataChannelFactory {
private: private:
FakeDataChannelProvider* provider_; FakeDataChannelProvider* provider_;
cricket::DataChannelType type_; cricket::DataChannelType type_;
webrtc::MediaStreamSignaling* media_stream_signaling_;
webrtc::InternalDataChannelInit last_init_; webrtc::InternalDataChannelInit last_init_;
}; };
@ -1265,7 +1272,8 @@ TEST_F(MediaStreamSignalingTest, SctpDuplicatedLabelAllowed) {
// message. // message.
TEST_F(MediaStreamSignalingTest, CreateDataChannelFromOpenMessage) { TEST_F(MediaStreamSignalingTest, CreateDataChannelFromOpenMessage) {
FakeDataChannelFactory fake_factory(data_channel_provider_.get(), FakeDataChannelFactory fake_factory(data_channel_provider_.get(),
cricket::DCT_SCTP); cricket::DCT_SCTP,
signaling_.get());
signaling_->SetDataChannelFactory(&fake_factory); signaling_->SetDataChannelFactory(&fake_factory);
webrtc::DataChannelInit config; webrtc::DataChannelInit config;
config.id = 1; config.id = 1;
@ -1285,7 +1293,8 @@ TEST_F(MediaStreamSignalingTest, DuplicatedLabelFromOpenMessageAllowed) {
AddDataChannel(cricket::DCT_SCTP, "a", -1); AddDataChannel(cricket::DCT_SCTP, "a", -1);
FakeDataChannelFactory fake_factory(data_channel_provider_.get(), FakeDataChannelFactory fake_factory(data_channel_provider_.get(),
cricket::DCT_SCTP); cricket::DCT_SCTP,
signaling_.get());
signaling_->SetDataChannelFactory(&fake_factory); signaling_->SetDataChannelFactory(&fake_factory);
webrtc::DataChannelInit config; webrtc::DataChannelInit config;
config.id = 0; config.id = 0;
@ -1314,3 +1323,24 @@ TEST_F(MediaStreamSignalingTest,
signaling_->OnRemoteSctpDataChannelClosed(config.id); signaling_->OnRemoteSctpDataChannelClosed(config.id);
EXPECT_EQ(webrtc::DataChannelInterface::kClosed, data_channel->state()); EXPECT_EQ(webrtc::DataChannelInterface::kClosed, data_channel->state());
} }
// Verifies that DataChannel added from OPEN message is added to
// MediaStreamSignaling only once (webrtc issue 3778).
TEST_F(MediaStreamSignalingTest, DataChannelFromOpenMessageAddedOnce) {
FakeDataChannelFactory fake_factory(data_channel_provider_.get(),
cricket::DCT_SCTP,
signaling_.get());
signaling_->SetDataChannelFactory(&fake_factory);
webrtc::DataChannelInit config;
config.id = 1;
rtc::Buffer payload;
webrtc::WriteDataChannelOpenMessage("a", config, &payload);
cricket::ReceiveDataParams params;
params.ssrc = config.id;
EXPECT_TRUE(signaling_->AddDataChannelFromOpenMessage(params, payload));
EXPECT_TRUE(signaling_->HasDataChannels());
// Removes the DataChannel and verifies that no DataChannel is left.
signaling_->RemoveSctpDataChannel(config.id);
EXPECT_FALSE(signaling_->HasDataChannels());
}