Build fix: retrieve unix socket peer PID on non-unix platforms

[lttng-tools.git] / src / common / unix.c

diff --git a/src/common/unix.c b/src/common/unix.c
index 623421cadb98642889c56b2a6cbd1f46e7a51ca4..4c5c7acc61a260b10162d83089b7373c8c18d297 100644 (file)
--- a/src/common/unix.c
+++ b/src/common/unix.c
@@ -181,6 +181,10 @@ ssize_t lttcomm_recv_unix_sock(int sock, void *buf, size_t len)
        ssize_t ret = -1;
        size_t len_last;
 
+       assert(sock);
+       assert(buf);
+       assert(len > 0);
+
        memset(&msg, 0, sizeof(msg));
 
        iov[0].iov_base = buf;
@@ -223,6 +227,10 @@ ssize_t lttcomm_recv_unix_sock_non_block(int sock, void *buf, size_t len)
        struct iovec iov[1];
        ssize_t ret;
 
+       assert(sock);
+       assert(buf);
+       assert(len > 0);
+
        memset(&msg, 0, sizeof(msg));
 
        iov[0].iov_base = buf;
@@ -271,6 +279,10 @@ ssize_t lttcomm_send_unix_sock(int sock, const void *buf, size_t len)
        struct iovec iov[1];
        ssize_t ret;
 
+       assert(sock);
+       assert(buf);
+       assert(len > 0);
+
        memset(&msg, 0, sizeof(msg));
 
        iov[0].iov_base = (void *) buf;
@@ -321,6 +333,10 @@ ssize_t lttcomm_send_unix_sock_non_block(int sock, const void *buf, size_t len)
        struct iovec iov[1];
        ssize_t ret;
 
+       assert(sock);
+       assert(buf);
+       assert(len > 0);
+
        memset(&msg, 0, sizeof(msg));
 
        iov[0].iov_base = (void *) buf;
@@ -395,6 +411,10 @@ ssize_t lttcomm_send_fds_unix_sock(int sock, const int *fds, size_t nb_fd)
        char tmp[CMSG_SPACE(sizeof_fds)];
        char dummy = 0;
 
+       assert(sock);
+       assert(fds);
+       assert(nb_fd > 0);
+
        memset(&msg, 0, sizeof(msg));
        memset(tmp, 0, sizeof(tmp));
 
@@ -525,6 +545,10 @@ ssize_t lttcomm_send_fds_unix_sock_non_block(int sock, const int *fds, size_t nb
        char tmp[CMSG_SPACE(sizeof_fds)];
        char dummy = 0;
 
+       assert(sock);
+       assert(fds);
+       assert(nb_fd > 0);
+
        memset(&msg, 0, sizeof(msg));
        memset(tmp, 0, sizeof(tmp));
 
@@ -614,6 +638,10 @@ ssize_t lttcomm_recv_fds_unix_sock(int sock, int *fds, size_t nb_fd)
        struct msghdr msg;
        char dummy;
 
+       assert(sock);
+       assert(fds);
+       assert(nb_fd > 0);
+
        memset(&msg, 0, sizeof(msg));
 
        /* Prepare to receive the structures */
@@ -763,6 +791,10 @@ ssize_t _lttcomm_recv_payload_fds_unix_sock(int sock, size_t nb_fd,
        int default_value = -1;
        struct lttng_dynamic_array raw_fds;
 
+       assert(sock);
+       assert(payload);
+       assert(nb_fd > 0);
+
        lttng_dynamic_array_init(&raw_fds, sizeof(int), close_raw_fd);
 
        for (i = 0; i < nb_fd; i++) {
@@ -780,7 +812,7 @@ ssize_t _lttcomm_recv_payload_fds_unix_sock(int sock, size_t nb_fd,
                                sock, (int *) raw_fds.buffer.data, nb_fd);
        }
 
-       if (ret < 0) {
+       if (ret <= 0) {
                goto end;
        }
 
@@ -829,6 +861,10 @@ ssize_t lttcomm_recv_fds_unix_sock_non_block(int sock, int *fds, size_t nb_fd)
        struct cmsghdr *cmsg;
        size_t sizeof_fds = nb_fd * sizeof(int);
 
+       assert(sock);
+       assert(fds);
+       assert(nb_fd > 0);
+
 #ifdef __linux__
 /* Account for the struct ucred cmsg in the buffer size */
 #define LTTNG_SOCK_RECV_FDS_BUF_SIZE CMSG_SPACE(sizeof_fds) + CMSG_SPACE(sizeof(struct ucred))
@@ -956,23 +992,27 @@ ssize_t lttcomm_send_creds_unix_sock(int sock, const void *buf, size_t len)
        struct msghdr msg;
        struct iovec iov[1];
        ssize_t ret = -1;
-#ifdef __linux__
+#if defined(__linux__) || defined(__CYGWIN__)
        struct cmsghdr *cmptr;
        size_t sizeof_cred = sizeof(lttng_sock_cred);
        char anc_buf[CMSG_SPACE(sizeof_cred)];
        lttng_sock_cred *creds;
 
        memset(anc_buf, 0, CMSG_SPACE(sizeof_cred) * sizeof(char));
-#endif /* __linux__ */
+#endif /* __linux__, __CYGWIN__ */
 
        memset(&msg, 0, sizeof(msg));
 
+       assert(sock);
+       assert(buf);
+       assert(len > 0);
+
        iov[0].iov_base = (void *) buf;
        iov[0].iov_len = len;
        msg.msg_iov = iov;
        msg.msg_iovlen = 1;
 
-#ifdef __linux__
+#if defined(__linux__) || defined(__CYGWIN__)
        msg.msg_control = (caddr_t) anc_buf;
        msg.msg_controllen = CMSG_LEN(sizeof_cred);
 
@@ -989,7 +1029,7 @@ ssize_t lttcomm_send_creds_unix_sock(int sock, const void *buf, size_t len)
        LTTNG_SOCK_SET_UID_CRED(creds, geteuid());
        LTTNG_SOCK_SET_GID_CRED(creds, getegid());
        LTTNG_SOCK_SET_PID_CRED(creds, getpid());
-#endif /* __linux__ */
+#endif /* __linux__, __CYGWIN__ */
 
        do {
                ret = sendmsg(sock, &msg, 0);
@@ -1019,19 +1059,18 @@ ssize_t lttcomm_recv_creds_unix_sock(int sock, void *buf, size_t len,
        struct iovec iov[1];
        ssize_t ret;
        size_t len_last;
-#ifdef __linux__
+#if defined(__linux__) || defined(__CYGWIN__)
        struct cmsghdr *cmptr;
        size_t sizeof_cred = sizeof(lttng_sock_cred);
        char anc_buf[CMSG_SPACE(sizeof_cred)];
-#endif /* __linux__ */
+#endif /* __linux__, __CYGWIN__ */
 
-       memset(&msg, 0, sizeof(msg));
+       assert(sock);
+       assert(buf);
+       assert(len > 0);
+       assert(creds);
 
-       /* Not allowed */
-       if (creds == NULL) {
-               ret = -1;
-               goto end;
-       }
+       memset(&msg, 0, sizeof(msg));
 
        /* Prepare to receive the structures */
        iov[0].iov_base = buf;
@@ -1039,10 +1078,10 @@ ssize_t lttcomm_recv_creds_unix_sock(int sock, void *buf, size_t len,
        msg.msg_iov = iov;
        msg.msg_iovlen = 1;
 
-#ifdef __linux__
+#if defined(__linux__) || defined(__CYGWIN__)
        msg.msg_control = anc_buf;
        msg.msg_controllen = sizeof(anc_buf);
-#endif /* __linux__ */
+#endif /* __linux__, __CYGWIN__ */
 
        do {
                len_last = iov[0].iov_len;
@@ -1061,7 +1100,7 @@ ssize_t lttcomm_recv_creds_unix_sock(int sock, void *buf, size_t len,
        }
        /* Else ret = 0 meaning an orderly shutdown. */
 
-#ifdef __linux__
+#if defined(__linux__) || defined(__CYGWIN__)
        if (msg.msg_flags & MSG_CTRUNC) {
                fprintf(stderr, "Error: Control message truncated.\n");
                ret = -1;
@@ -1090,18 +1129,15 @@ ssize_t lttcomm_recv_creds_unix_sock(int sock, void *buf, size_t len,
        }
 
        memcpy(creds, CMSG_DATA(cmptr), sizeof_cred);
-#elif (defined(__FreeBSD__) || defined(__CYGWIN__) || defined(__sun__) || defined(__APPLE__))
-       {
-               int peer_ret;
-
-               peer_ret = getpeereid(sock, &creds->uid, &creds->gid);
-               if (peer_ret != 0) {
-                       return peer_ret;
-               }
+#elif (defined(__FreeBSD__) || defined(__sun__) || defined(__APPLE__))
+       if (lttng_get_unix_socket_peer_creds(sock, creds)) {
+               fprintf(stderr, "ARG\n");
+               ret = -1;
+               goto end;
        }
 #else
 #error "Please implement credential support for your OS."
-#endif /* __linux__ */
+#endif /* __linux__, __CYGWIN__ */
 
 end:
        return ret;
@@ -1110,7 +1146,7 @@ end:
 /*
  * Set socket option to use credentials passing.
  */
-#ifdef __linux__
+#if defined(__linux__) || defined(__CYGWIN__)
 LTTNG_HIDDEN
 int lttcomm_setsockopt_creds_unix_sock(int sock)
 {
@@ -1123,7 +1159,7 @@ int lttcomm_setsockopt_creds_unix_sock(int sock)
        }
        return ret;
 }
-#elif (defined(__FreeBSD__) || defined(__CYGWIN__) || defined(__sun__) || defined(__APPLE__))
+#elif (defined(__FreeBSD__) || defined(__sun__) || defined(__APPLE__))
 LTTNG_HIDDEN
 int lttcomm_setsockopt_creds_unix_sock(int sock)
 {