usock: add usock_inet, which returns the remote address

[project/libubox.git] / usock.c

diff --git a/usock.c b/usock.c
index db1ddce..62a5f20 100644 (file)
--- 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,9 +66,11 @@ 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)
 {
        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)) {
                errno = EINVAL;
@@ -74,11 +78,13 @@ 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)
+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 hints = {
                .ai_family = (type & USOCK_IPV6ONLY) ? AF_INET6 :
@@ -94,9 +100,12 @@ 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);
-               if (sock >= 0)
+               sock = usock_connect(type, rp->ai_addr, rp->ai_addrlen, rp->ai_family, socktype, server);
+               if (sock >= 0) {
+                       if (addr)
+                               memcpy(addr, rp->ai_addr, rp->ai_addrlen);
                        break;
+               }
        }
 
        freeaddrinfo(result);
@@ -116,19 +125,16 @@ const char *usock_port(int port)
 }
 
 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;
 
        if (type & USOCK_UNIX)
-               sock = usock_unix(host, socktype, server);
+               sock = usock_unix(type, host);
        else
-               sock = usock_inet(type, host, service, socktype, server);
+               sock = usock_inet(type, host, service, NULL);
 
        if (sock < 0)
                return -1;
 
-       usock_set_flags(sock, type);
        return sock;
 }