From f1c794b29e2dac52ec25869bf8c37b3e230fb2a2 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Rafa=C5=82=20Mi=C5=82ecki?= Date: Thu, 15 Jan 2015 12:42:52 +0100 Subject: [PATCH] usock: set socket flags right after creating it MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Otherwise some flags like USOCK_NONBLOCK wouldn't work as expected (O_NONBLOCK affects connect behavior). Signed-off-by: Rafał Miłecki --- usock.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/usock.c b/usock.c index db1ddce..6748ef3 100644 --- a/usock.c +++ b/usock.c @@ -40,7 +40,7 @@ static void usock_set_flags(int sock, unsigned int type) fcntl(sock, F_SETFL, fcntl(sock, F_GETFL) | O_NONBLOCK); } -static int usock_connect(struct sockaddr *sa, int sa_len, int family, int socktype, bool server) +static int usock_connect(int type, struct sockaddr *sa, int sa_len, int family, int socktype, bool server) { int sock; @@ -48,6 +48,8 @@ static int usock_connect(struct sockaddr *sa, int sa_len, int family, int sockty if (sock < 0) return -1; + usock_set_flags(sock, type); + if (server) { const int one = 1; setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, &one, sizeof(one)); @@ -64,7 +66,7 @@ static int usock_connect(struct sockaddr *sa, int sa_len, int family, int sockty return -1; } -static int usock_unix(const char *host, int socktype, bool server) +static int usock_unix(int type, const char *host, int socktype, bool server) { struct sockaddr_un sun = {.sun_family = AF_UNIX}; @@ -74,7 +76,7 @@ static int usock_unix(const char *host, int socktype, bool server) } strcpy(sun.sun_path, host); - return usock_connect((struct sockaddr*)&sun, sizeof(sun), AF_UNIX, socktype, server); + return usock_connect(type, (struct sockaddr*)&sun, sizeof(sun), AF_UNIX, socktype, server); } static int usock_inet(int type, const char *host, const char *service, int socktype, bool server) @@ -94,7 +96,7 @@ static int usock_inet(int type, const char *host, const char *service, int sockt return -1; for (rp = result; rp != NULL; rp = rp->ai_next) { - sock = usock_connect(rp->ai_addr, rp->ai_addrlen, rp->ai_family, socktype, server); + sock = usock_connect(type, rp->ai_addr, rp->ai_addrlen, rp->ai_family, socktype, server); if (sock >= 0) break; } @@ -121,14 +123,13 @@ int usock(int type, const char *host, const char *service) { int sock; if (type & USOCK_UNIX) - sock = usock_unix(host, socktype, server); + sock = usock_unix(type, host, socktype, server); else sock = usock_inet(type, host, service, socktype, server); if (sock < 0) return -1; - usock_set_flags(sock, type); return sock; } -- 2.25.1