Ensuring that UDP TURN servers are always used as STUN servers.

webrtc/base/socketadapters.cc

 /*
  *  Copyright 2004 The WebRTC Project Authors. All rights reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 63 matching lines @@
     if (data_len_ > 0) {
       memmove(buffer_, buffer_ + read, data_len_);
     }
     pv = static_cast<char *>(pv) + read;
     cb -= read;
   }
 
   // FIX: If cb == 0, we won't generate another read event
 
   int res = AsyncSocketAdapter::Recv(pv, cb);
-  if (res < 0)
-    return res;
+  if (res >= 0) {
+    // Read from socket and possibly buffer; return combined length
+    return res + static_cast<int>(read);
+  }
 
-  return res + static_cast<int>(read);
+  if (read > 0) {
+    // Failed to read from socket, but still read something from buffer
+    return static_cast<int>(read);
+  }
+
+  // Didn't read anything; return error from socket
+  return res;
 }
 
 void BufferedReadAdapter::BufferInput(bool on) {
   buffering_ = on;
 }
 
 void BufferedReadAdapter::OnReadEvent(AsyncSocket * socket) {
   ASSERT(socket == socket_);
 
   if (!buffering_) {
@@ skipping 797 matching lines @@
 void LoggingSocketAdapter::OnCloseEvent(AsyncSocket * socket, int err) {
   LogMultiline(level_, label_.c_str(), false, NULL, 0, hex_mode_, &lms_);
   LogMultiline(level_, label_.c_str(), true, NULL, 0, hex_mode_, &lms_);
   LOG_V(level_) << label_ << " Closed with error: " << err;
   AsyncSocketAdapter::OnCloseEvent(socket, err);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
 }  // namespace rtc