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

webrtc/base/socketadapters.cc

Index: webrtc/base/socketadapters.cc
diff --git a/webrtc/base/socketadapters.cc b/webrtc/base/socketadapters.cc
index 4a2da0adfcd800ea53519505f6ee458ad36155dd..ec948218eafedf5a23625ce43d9a26a9e8a7d231 100644
--- a/webrtc/base/socketadapters.cc
+++ b/webrtc/base/socketadapters.cc
@@ -82,7 +82,7 @@ int BufferedReadAdapter::Recv(void *pv, size_t cb) {
 
   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;