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

usock: remove code duplication

Browse source
This commit is contained in:
Felix Fietkau 2011-02-07 17:00:50 +01:00
parent a5e2b50652
commit 07dbea0058
1 changed files with 83 additions and 84 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

127
usock.c
View file

@ -7,96 +7,95 @@
#include <fcntl.h> #include <fcntl.h>
#include <errno.h> #include <errno.h>
#include <string.h> #include <string.h>
#include <stdbool.h>
#include "usock.h" #include "usock.h"
int usock(int type, const char *host, const char *service) { static void usock_set_flags(int sock, unsigned int type)
int sock = -1; {
if (!(type & USOCK_NOCLOEXEC))
if (service && !(type & USOCK_UNIX)) {
struct addrinfo *result, *rp;
struct addrinfo hints = {
.ai_family = (type & USOCK_IPV6ONLY) ? AF_INET6 :
(type & USOCK_IPV4ONLY) ? AF_INET : AF_UNSPEC,
.ai_socktype = ((type & 0xff) == USOCK_TCP)
? SOCK_STREAM : SOCK_DGRAM,
.ai_flags = AI_ADDRCONFIG
| ((type & USOCK_SERVER) ? AI_PASSIVE : 0)
| ((type & USOCK_NUMERIC) ? AI_NUMERICHOST : 0),
};
if (getaddrinfo(host, service, &hints, &result)) {
return -1;
}
for (rp = result; rp != NULL; rp = rp->ai_next) {
if ((sock = socket(rp->ai_family, rp->ai_socktype, rp->ai_protocol))
== -1) {
continue;
}
if (!(type & USOCK_NOCLOEXEC)) {
fcntl(sock, F_SETFD, fcntl(sock, F_GETFD) | FD_CLOEXEC); fcntl(sock, F_SETFD, fcntl(sock, F_GETFD) | FD_CLOEXEC);
}
if (type & USOCK_NONBLOCK) { if (type & USOCK_NONBLOCK)
fcntl(sock, F_SETFL, fcntl(sock, F_GETFL) | O_NONBLOCK); fcntl(sock, F_SETFL, fcntl(sock, F_GETFL) | O_NONBLOCK);
} }
if (type & USOCK_SERVER) { static int usock_connect(struct sockaddr *sa, int sa_len, int family, int socktype, bool server)
{
int sock;
sock = socket(family, socktype, 0);
if (sock < 0)
return -1;
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));
if (!bind(sock, rp->ai_addr, rp->ai_addrlen) if (!bind(sock, sa, sa_len) &&
&& ((type & 0xff) != USOCK_TCP || !listen(sock, SOMAXCONN))) { (socktype != SOCK_STREAM || !listen(sock, SOMAXCONN)))
break; return sock;
}
} else { } else {
if (!connect(sock, rp->ai_addr, rp->ai_addrlen) if (!connect(sock, sa, sa_len) || errno == EINPROGRESS)
|| errno == EINPROGRESS) { return sock;
break;
}
} }
close(sock); close(sock);
sock = -1; return -1;
} }
freeaddrinfo(result);
} else { static int usock_unix(const char *host, int socktype, bool server)
{
struct sockaddr_un sun = {.sun_family = AF_UNIX}; struct sockaddr_un sun = {.sun_family = AF_UNIX};
if (strlen(host) >= sizeof(sun.sun_path)) { if (strlen(host) >= sizeof(sun.sun_path)) {
errno = EINVAL; errno = EINVAL;
return -1; return -1;
} }
strcpy(sun.sun_path, host); strcpy(sun.sun_path, host);
if ((sock = socket(AF_UNIX, ((type & 0xff) == USOCK_TCP) return usock_connect((struct sockaddr*)&sun, sizeof(sun), AF_UNIX, socktype, server);
? SOCK_STREAM : SOCK_DGRAM, 0)) == -1) {
return -1;
} }
if (!(type & USOCK_NOCLOEXEC)) { static int usock_inet(int type, const char *host, const char *service, int socktype, bool server)
fcntl(sock, F_SETFD, fcntl(sock, F_GETFD) | FD_CLOEXEC); {
struct addrinfo *result, *rp;
struct addrinfo hints = {
.ai_family = (type & USOCK_IPV6ONLY) ? AF_INET6 :
(type & USOCK_IPV4ONLY) ? AF_INET : AF_UNSPEC,
.ai_socktype = socktype,
.ai_flags = AI_ADDRCONFIG
| ((type & USOCK_SERVER) ? AI_PASSIVE : 0)
| ((type & USOCK_NUMERIC) ? AI_NUMERICHOST : 0),
};
int sock = -1;
if (getaddrinfo(host, service, &hints, &result))
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);
if (sock >= 0)
break;
} }
if (type & USOCK_NONBLOCK) { freeaddrinfo(result);
fcntl(sock, F_SETFL, fcntl(sock, F_GETFL) | O_NONBLOCK); return sock;
} }
if (type & USOCK_SERVER) { int usock(int type, const char *host, const char *service) {
if (bind(sock, (struct sockaddr*)&sun, sizeof(sun)) || int socktype = ((type & 0xff) == USOCK_TCP) ? SOCK_STREAM : SOCK_DGRAM;
((type & 0xff) == USOCK_TCP && listen(sock, SOMAXCONN))) { bool server = !!(type & USOCK_SERVER);
close(sock); int sock;
return -1;
} if (type & USOCK_UNIX)
} else { sock = usock_unix(host, socktype, server);
if (connect(sock, (struct sockaddr*)&sun, sizeof(sun)) else
&& errno != EINPROGRESS) { sock = usock_inet(type, host, service, socktype, server);
close(sock);
return -1; if (sock < 0)
} return -1;
}
} usock_set_flags(sock, type);
return sock; return sock;
} }