From: Rusty Russell <rusty@rustcorp.com.au>
Date: Thu, 12 Dec 2013 04:55:46 +0000 (+1030)
Subject: net: fix async connect to non-listening port.
X-Git-Url: https://git.ozlabs.org/?p=ccan;a=commitdiff_plain;h=fc8acdbbe2484794aa3c3bea8c00f0de80e48811

net: fix async connect to non-listening port.

In this case, Linux (at least, Ubuntu 13.10, x86-64 kernel 3.11.0-14-generic)
sets POLLHUP and gives no other error notification.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
---

diff --git a/ccan/net/net.c b/ccan/net/net.c
index d2eaa9ec..394c4e49 100644
--- a/ccan/net/net.c
+++ b/ccan/net/net.c
@@ -148,6 +148,17 @@ 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 (getsockopt(pfds[i].fd, SOL_SOCKET, SO_ERROR, &err,
 			       &errlen) != 0) {
 			net_connect_abort(pfds);