X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=ccan%2Fnet%2Fnet.c;h=7867054d9adf6c39bb48d68d8221c09c19925b86;hb=63b0055673d2c55ff90f8b7bd8a7c5fe30f83269;hp=394c4e49f2bb16024ea576b0aa68ed1376c25bcc;hpb=fc8acdbbe2484794aa3c3bea8c00f0de80e48811;p=ccan

diff --git a/ccan/net/net.c b/ccan/net/net.c
index 394c4e49..7867054d 100644
--- a/ccan/net/net.c
+++ b/ccan/net/net.c
@@ -116,7 +116,7 @@ int net_connect_async(const struct addrinfo *addrinfo, struct pollfd pfds[2])
 				close_noerr(pfds[i].fd);
 				return -1;
 			}
-			return pfds[0].fd;
+			return pfds[i].fd;
 		}
 	}
 
@@ -159,6 +159,9 @@ int net_connect_complete(struct pollfd pfds[2])
 			}
 			continue;
 		}
+		if (!(pfds[i].revents & POLLOUT))
+			continue;
+
 		if (getsockopt(pfds[i].fd, SOL_SOCKET, SO_ERROR, &err,
 			       &errlen) != 0) {
 			net_connect_abort(pfds);