From 5c345a1e1044f78709621857224f503f985dc5b0 Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Thu, 17 Jul 2014 13:09:55 +0930 Subject: [PATCH 1/1] io: fix io_connect(). How embarrassing: we weren't actually doing a non-blocking connect because I was using F_SETFD instead of F_SETFL... Signed-off-by: Rusty Russell --- ccan/io/io.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ccan/io/io.c b/ccan/io/io.c index 3f618249..bac08c9f 100644 --- a/ccan/io/io.c +++ b/ccan/io/io.c @@ -403,8 +403,8 @@ struct io_plan io_connect_(int fd, const struct addrinfo *addr, plan.next_arg = arg; /* Save old flags, set nonblock if not already. */ - plan.u1.s = fcntl(fd, F_GETFD); - fcntl(fd, F_SETFD, plan.u1.s | O_NONBLOCK); + plan.u1.s = fcntl(fd, F_GETFL); + fcntl(fd, F_SETFL, plan.u1.s | O_NONBLOCK); /* Immediate connect can happen. */ if (connect(fd, addr->ai_addr, addr->ai_addrlen) == 0) { -- 2.39.2