commit 583d3e9594e3a175a91c6572ca0035e5847784b1
author Mitch Rudominer <rudominer@google.com> Thu Oct 05 04:36:00 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Oct 05 04:36:00 2017 +0000
tree adb593ed708490f4faaf86dbcd4d60c01434a227
parent 60160de187af72f65a20b1539ab305c1d8a6f591
parent 1f8acd3dd38c4255b86b12540b1eeca58b53f36a

Merge "Temporary hack to fix TLS bug." into cobalt-v1.6.x

src/core/lib/iomgr/tcp_client_posix.c

diff --git a/src/core/lib/iomgr/tcp_client_posix.c b/src/core/lib/iomgr/tcp_client_posix.c
index a25fba4..29d9431 100644
--- a/src/core/lib/iomgr/tcp_client_posix.c
+++ b/src/core/lib/iomgr/tcp_client_posix.c
@@ -281,6 +281,15 @@
     GPR_ASSERT(addr->len < ~(socklen_t)0);
     err =
         connect(fd, (const struct sockaddr *)addr->addr, (socklen_t)addr->len);
+    if (err >= 0) {
+      // Note(rudominer) This is a temporary hack designed to work around two
+      // bugs:
+      // (1) Fuchsia's implementation of connect() does not honor O_NONBLOCK
+      // (2) gRPC with TLS does not complete the TLS handshake if the branch
+      //     "if (err >= 0)" below is taken.
+      err = -1;
+      errno = EINPROGRESS;
+    }
   } while (err < 0 && errno == EINTR);
 
   addr_str = grpc_sockaddr_to_uri(addr);