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

usock: add usock_inet, which returns the remote address

Browse source 
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
This commit is contained in:
Felix Fietkau 2016-01-15 21:04:16 +01:00
parent 682e071ef7
commit f8b32f7620
2 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
usock.c
View file

@ -66,9 +66,11 @@ static int usock_connect(int type, struct sockaddr *sa, int sa_len, int family,
return -1; return -1;
} }
static int usock_unix(int type, const char *host, int socktype, bool server) static int usock_unix(int type, const char *host)
{ {
struct sockaddr_un sun = {.sun_family = AF_UNIX}; struct sockaddr_un sun = {.sun_family = AF_UNIX};
bool server = !!(type & USOCK_SERVER);
int socktype = ((type & 0xff) == USOCK_TCP) ? SOCK_STREAM : SOCK_DGRAM;
if (strlen(host) >= sizeof(sun.sun_path)) { if (strlen(host) >= sizeof(sun.sun_path)) {
errno = EINVAL; errno = EINVAL;
@ -79,8 +81,10 @@ static int usock_unix(int type, const char *host, int socktype, bool server)
return usock_connect(type, (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) int usock_inet(int type, const char *host, const char *service, void *addr)
{ {
int socktype = ((type & 0xff) == USOCK_TCP) ? SOCK_STREAM : SOCK_DGRAM;
bool server = !!(type & USOCK_SERVER);
struct addrinfo *result, *rp; struct addrinfo *result, *rp;
struct addrinfo hints = { struct addrinfo hints = {
.ai_family = (type & USOCK_IPV6ONLY) ? AF_INET6 : .ai_family = (type & USOCK_IPV6ONLY) ? AF_INET6 :
@ -97,9 +101,12 @@ static int usock_inet(int type, const char *host, const char *service, int sockt
for (rp = result; rp != NULL; rp = rp->ai_next) { for (rp = result; rp != NULL; rp = rp->ai_next) {
sock = usock_connect(type, 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) {
if (addr)
memcpy(addr, rp->ai_addr, rp->ai_addrlen);
break; break;
} }
}
freeaddrinfo(result); freeaddrinfo(result);
return sock; return sock;
@ -118,14 +125,12 @@ const char *usock_port(int port)
} }
int usock(int type, const char *host, const char *service) { int usock(int type, const char *host, const char *service) {
int socktype = ((type & 0xff) == USOCK_TCP) ? SOCK_STREAM : SOCK_DGRAM;
bool server = !!(type & USOCK_SERVER);
int sock; int sock;
if (type & USOCK_UNIX) if (type & USOCK_UNIX)
sock = usock_unix(type, host, socktype, server); sock = usock_unix(type, host);
else else
sock = usock_inet(type, host, service, socktype, server); sock = usock_inet(type, host, service, NULL);
if (sock < 0) if (sock < 0)
return -1; return -1;

1
usock.h
View file

@ -32,6 +32,7 @@
const char *usock_port(int port); const char *usock_port(int port);
int usock(int type, const char *host, const char *service); int usock(int type, const char *host, const char *service);
int usock_inet(int type, const char *host, const char *service, void *addr);
/** /**
* Wait for a socket to become ready. * Wait for a socket to become ready.