commit 04d269c8b23eb6f96d1addb3b4452ec259b3fd34
author jiayl@webrtc.org <jiayl@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> Fri Jul 18 23:57:50 2014 +0000
committer jiayl@webrtc.org <jiayl@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> Fri Jul 18 23:57:50 2014 +0000
tree 4bc5b47f74903e65c6e82f12c25ddc1323a48d9b
parent c65cdaf661502a5dbf4bd4799b84117034e8a02a

Ignore empty data in DataChannel::Send to match FF's behavior.

BUG=crbug/395205
R=pthatcher@webrtc.org

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk/talk@6742 4adac7df-926f-26a2-2b94-8c16560cd09d

app/webrtc/datachannel.cc

diff --git a/app/webrtc/datachannel.cc b/app/webrtc/datachannel.cc
index af4fb24..d98f8be 100644
--- a/app/webrtc/datachannel.cc
+++ b/app/webrtc/datachannel.cc
@@ -195,6 +195,14 @@
   if (state_ != kOpen) {
     return false;
   }
+
+  // TODO(jiayl): the spec is unclear about if the remote side should get the
+  // onmessage event. We need to figure out the expected behavior and change the
+  // code accordingly.
+  if (buffer.size() == 0) {
+    return true;
+  }
+
   // If the queue is non-empty, we're waiting for SignalReadyToSend,
   // so just add to the end of the queue and keep waiting.
   if (!queued_send_data_.Empty()) {

app/webrtc/datachannel_unittest.cc

diff --git a/app/webrtc/datachannel_unittest.cc b/app/webrtc/datachannel_unittest.cc
index 6f223fe..ef4d26f 100644
--- a/app/webrtc/datachannel_unittest.cc
+++ b/app/webrtc/datachannel_unittest.cc
@@ -410,3 +410,16 @@
   EXPECT_EQ(webrtc::DataChannelInterface::kClosed,
             webrtc_data_channel_->state());
 }
+
+// Tests that sending empty data returns no error and keeps the channel open.
+TEST_F(SctpDataChannelTest, SendEmptyData) {
+  webrtc_data_channel_->SetSctpSid(1);
+  SetChannelReady();
+  EXPECT_EQ(webrtc::DataChannelInterface::kOpen,
+            webrtc_data_channel_->state());
+
+  webrtc::DataBuffer buffer("");
+  EXPECT_TRUE(webrtc_data_channel_->Send(buffer));
+  EXPECT_EQ(webrtc::DataChannelInterface::kOpen,
+            webrtc_data_channel_->state());
+}

app/webrtc/test/fakedatachannelprovider.h

diff --git a/app/webrtc/test/fakedatachannelprovider.h b/app/webrtc/test/fakedatachannelprovider.h
index 053b3ac..5859cdb 100644
--- a/app/webrtc/test/fakedatachannelprovider.h
+++ b/app/webrtc/test/fakedatachannelprovider.h
@@ -45,7 +45,7 @@
       return false;
     }
 
-    if (transport_error_) {
+    if (transport_error_ || payload.length() == 0) {
       *result = cricket::SDR_ERROR;
       return false;
     }