X-Git-Url: https://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Fnet%2Fnet.c;h=7867054d9adf6c39bb48d68d8221c09c19925b86;hp=d2eaa9ecb45e58660fb80ea607210226d3385a7f;hb=291237b4fed863be74051274ac5ad9920cb33cc3;hpb=641b511049e5c03d45ada0c3fd829691b173e5d1;ds=sidebyside

diff --git a/ccan/net/net.c b/ccan/net/net.c
index d2eaa9ec..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;
 		}
 	}
 
@@ -148,6 +148,20 @@ int net_connect_complete(struct pollfd pfds[2])
 
 		if (pfds[i].fd == -1)
 			continue;
+		if (pfds[i].revents & POLLHUP) {
+			/* Linux gives this if connecting to local
+			 * non-listening port */
+			close(pfds[i].fd);
+			pfds[i].fd = -1;
+			if (pfds[!i].fd == -1) {
+				errno = ECONNREFUSED;
+				return -1;
+			}
+			continue;
+		}
+		if (!(pfds[i].revents & POLLOUT))
+			continue;
+
 		if (getsockopt(pfds[i].fd, SOL_SOCKET, SO_ERROR, &err,
 			       &errlen) != 0) {
 			net_connect_abort(pfds);