DGNum/libubox
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

usock: set socket flags right after creating it

Browse source 
Otherwise some flags like USOCK_NONBLOCK wouldn't work as expected
(O_NONBLOCK affects connect behavior).

Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
This commit is contained in:
Rafał Miłecki 2015-01-15 12:42:52 +01:00 committed by Felix Fietkau
parent ad9b5a387d
commit f1c794b29e
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
usock.c
View file

@ -40,7 +40,7 @@ static void usock_set_flags(int sock, unsigned int type)
fcntl(sock, F_SETFL, fcntl(sock, F_GETFL) | O_NONBLOCK); 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; int sock;
@ -48,6 +48,8 @@ static int usock_connect(struct sockaddr *sa, int sa_len, int family, int sockty
if (sock < 0) if (sock < 0)
return -1; return -1;
usock_set_flags(sock, type);
if (server) { if (server) {
const int one = 1; const int one = 1;
setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, &one, sizeof(one)); 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; 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}; 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); 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) 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; return -1;
for (rp = result; rp != NULL; rp = rp->ai_next) { 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) if (sock >= 0)
break; break;
} }
@ -121,14 +123,13 @@ int usock(int type, const char *host, const char *service) {
int sock; int sock;
if (type & USOCK_UNIX) if (type & USOCK_UNIX)
sock = usock_unix(host, socktype, server); sock = usock_unix(type, host, socktype, server);
else else
sock = usock_inet(type, host, service, socktype, server); sock = usock_inet(type, host, service, socktype, server);
if (sock < 0) if (sock < 0)
return -1; return -1;
usock_set_flags(sock, type);
return sock; return sock;
} }