af_unix: add lxc_unix_connect_type

[mirror_lxc.git] / src / lxc / af_unix.c

diff --git a/src/lxc/af_unix.c b/src/lxc/af_unix.c
index 328f891f0b7a3d7384acc044ab75961370e03b0b..2ff98dc1b6e6de6cdc3f2ac430219d3dcf4c27a3 100644 (file)
--- a/src/lxc/af_unix.c
+++ b/src/lxc/af_unix.c
@@ -81,7 +81,7 @@ int lxc_abstract_unix_open(const char *path, int type, int flags)
        ssize_t len;
        struct sockaddr_un addr;
 
-       fd = socket(PF_UNIX, type, 0);
+       fd = socket(PF_UNIX, type | SOCK_CLOEXEC, 0);
        if (fd < 0)
                return -1;
 
@@ -129,7 +129,7 @@ int lxc_abstract_unix_connect(const char *path)
        ssize_t len;
        struct sockaddr_un addr;
 
-       fd = socket(PF_UNIX, SOCK_STREAM, 0);
+       fd = socket(PF_UNIX, SOCK_STREAM | SOCK_CLOEXEC, 0);
        if (fd < 0)
                return -1;
 
@@ -153,18 +153,16 @@ int lxc_abstract_unix_connect(const char *path)
        return fd;
 }
 
-int lxc_abstract_unix_send_fds(int fd, int *sendfds, int num_sendfds,
-                              void *data, size_t size)
+int lxc_abstract_unix_send_fds_iov(int fd, int *sendfds, int num_sendfds,
+                                  struct iovec *iov, size_t iovlen)
 {
-       __do_free char *cmsgbuf;
+       __do_free char *cmsgbuf = NULL;
+       int ret;
        struct msghdr msg;
-       struct iovec iov;
        struct cmsghdr *cmsg = NULL;
-       char buf[1] = {0};
        size_t cmsgbufsize = CMSG_SPACE(num_sendfds * sizeof(int));
 
        memset(&msg, 0, sizeof(msg));
-       memset(&iov, 0, sizeof(iov));
 
        cmsgbuf = malloc(cmsgbufsize);
        if (!cmsgbuf) {
@@ -184,28 +182,48 @@ int lxc_abstract_unix_send_fds(int fd, int *sendfds, int num_sendfds,
 
        memcpy(CMSG_DATA(cmsg), sendfds, num_sendfds * sizeof(int));
 
-       iov.iov_base = data ? data : buf;
-       iov.iov_len = data ? size : sizeof(buf);
-       msg.msg_iov = &iov;
-       msg.msg_iovlen = 1;
+       msg.msg_iov = iov;
+       msg.msg_iovlen = iovlen;
 
-       return sendmsg(fd, &msg, MSG_NOSIGNAL);
+again:
+       ret = sendmsg(fd, &msg, MSG_NOSIGNAL);
+       if (ret < 0)
+               if (errno == EINTR)
+                       goto again;
+
+       return ret;
 }
 
-int lxc_abstract_unix_recv_fds(int fd, int *recvfds, int num_recvfds,
+int lxc_abstract_unix_send_fds(int fd, int *sendfds, int num_sendfds,
                               void *data, size_t size)
 {
-       __do_free char *cmsgbuf;
+       char buf[1] = {0};
+       struct iovec iov = {
+               .iov_base = data ? data : buf,
+               .iov_len = data ? size : sizeof(buf),
+       };
+       return lxc_abstract_unix_send_fds_iov(fd, sendfds, num_sendfds, &iov,
+                                             1);
+}
+
+int lxc_unix_send_fds(int fd, int *sendfds, int num_sendfds, void *data,
+                     size_t size)
+{
+       return lxc_abstract_unix_send_fds(fd, sendfds, num_sendfds, data, size);
+}
+
+static int lxc_abstract_unix_recv_fds_iov(int fd, int *recvfds, int num_recvfds,
+                                         struct iovec *iov, size_t iovlen)
+{
+       __do_free char *cmsgbuf = NULL;
        int ret;
        struct msghdr msg;
-       struct iovec iov;
        struct cmsghdr *cmsg = NULL;
        char buf[1] = {0};
        size_t cmsgbufsize = CMSG_SPACE(sizeof(struct ucred)) +
                             CMSG_SPACE(num_recvfds * sizeof(int));
 
        memset(&msg, 0, sizeof(msg));
-       memset(&iov, 0, sizeof(iov));
 
        cmsgbuf = malloc(cmsgbufsize);
        if (!cmsgbuf) {
@@ -216,13 +234,18 @@ int lxc_abstract_unix_recv_fds(int fd, int *recvfds, int num_recvfds,
        msg.msg_control = cmsgbuf;
        msg.msg_controllen = cmsgbufsize;
 
-       iov.iov_base = data ? data : buf;
-       iov.iov_len = data ? size : sizeof(buf);
-       msg.msg_iov = &iov;
-       msg.msg_iovlen = 1;
+       msg.msg_iov = iov;
+       msg.msg_iovlen = iovlen;
 
+again:
        ret = recvmsg(fd, &msg, 0);
-       if (ret <= 0)
+       if (ret < 0) {
+               if (errno == EINTR)
+                       goto again;
+
+               goto out;
+       }
+       if (ret == 0)
                goto out;
 
        /*
@@ -244,6 +267,17 @@ out:
        return ret;
 }
 
+int lxc_abstract_unix_recv_fds(int fd, int *recvfds, int num_recvfds,
+                              void *data, size_t size)
+{
+       char buf[1] = {0};
+       struct iovec iov = {
+               .iov_base = data ? data : buf,
+               .iov_len = data ? size : sizeof(buf),
+       };
+       return lxc_abstract_unix_recv_fds_iov(fd, recvfds, num_recvfds, &iov, 1);
+}
+
 int lxc_abstract_unix_send_credential(int fd, void *data, size_t size)
 {
        struct msghdr msg = {0};
@@ -345,28 +379,38 @@ int lxc_unix_sockaddr(struct sockaddr_un *ret, const char *path)
        return (int)(offsetof(struct sockaddr_un, sun_path) + len + 1);
 }
 
-int lxc_unix_connect(struct sockaddr_un *addr)
+int lxc_unix_connect_type(struct sockaddr_un *addr, int type)
 {
        __do_close_prot_errno int fd = -EBADF;
        int ret;
        ssize_t len;
 
-       fd = socket(PF_UNIX, SOCK_STREAM, SOCK_CLOEXEC);
-       if (fd < 0)
+       fd = socket(AF_UNIX, type | SOCK_CLOEXEC, 0);
+       if (fd < 0) {
+               SYSERROR("Failed to open new AF_UNIX socket");
                return -1;
+       }
 
        if (addr->sun_path[0] == '\0')
                len = strlen(&addr->sun_path[1]);
        else
                len = strlen(&addr->sun_path[0]);
-       ret = connect(fd, (struct sockaddr *)&addr,
-                     offsetof(struct sockaddr_un, sun_path) + len + 1);
-       if (ret < 0)
+
+       ret = connect(fd, (struct sockaddr *)addr,
+                     offsetof(struct sockaddr_un, sun_path) + len);
+       if (ret < 0) {
+               SYSERROR("Failed to bind new AF_UNIX socket");
                return -1;
+       }
 
        return move_fd(fd);
 }
 
+int lxc_unix_connect(struct sockaddr_un *addr, int type)
+{
+       return lxc_unix_connect_type(addr, SOCK_STREAM);
+}
+
 int lxc_socket_set_timeout(int fd, int rcv_timeout, int snd_timeout)
 {
        struct timeval out = {0};