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 64 matching lines @@
       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;
+    return read ? static_cast<int>(read) : res;
 
   return res + static_cast<int>(read);
 }

[pthatcher1, 2015/07/15 23:42:24]

I think this would be more clear as something like this:

if (res >= 0) {
  // Read from socket and maybe buffer.  Return combined length.
  return res + static_cast<int>(read);
}

if (read > 0) {
  // Read from buffer and failed to read from socket.
  // Return amount read from buffer.  
  return read;
}

// Didn't read from buffer and failed to read from socket.
// Return error from socket.
return res;

 
 void BufferedReadAdapter::BufferInput(bool on) {
   buffering_ = on;
 }
 
 void BufferedReadAdapter::OnReadEvent(AsyncSocket * socket) {
   ASSERT(socket == socket_);
 
   if (!buffering_) {
     AsyncSocketAdapter::OnReadEvent(socket);
@@ skipping 796 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