projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.lttng.org/lttng-tools
[lttng-tools.git]
/
src
/
common
/
sessiond-comm
/
sessiond-comm.c
diff --git
a/src/common/sessiond-comm/sessiond-comm.c
b/src/common/sessiond-comm/sessiond-comm.c
index 0c29003a6267a382b204a6f277a9d0a1468ad182..aa24e82ddff31d80f6d0d15fe969aca8dc80f49e 100644
(file)
--- a/
src/common/sessiond-comm/sessiond-comm.c
+++ b/
src/common/sessiond-comm/sessiond-comm.c
@@
-24,11
+24,11
@@
#include <string.h>
#include <sys/stat.h>
#include <sys/types.h>
#include <string.h>
#include <sys/stat.h>
#include <sys/types.h>
-#include <sys/un.h>
#include <unistd.h>
#include <errno.h>
#include <common/defaults.h>
#include <unistd.h>
#include <errno.h>
#include <common/defaults.h>
+#include <common/error.h>
#include "sessiond-comm.h"
#include "sessiond-comm.h"
@@
-141,12
+141,11
@@
const char *lttcomm_get_readable_code(enum lttcomm_return_code code)
int lttcomm_connect_unix_sock(const char *pathname)
{
struct sockaddr_un sun;
int lttcomm_connect_unix_sock(const char *pathname)
{
struct sockaddr_un sun;
- int fd;
- int ret;
+ int fd, ret, closeret;
fd = socket(PF_UNIX, SOCK_STREAM, 0);
if (fd < 0) {
fd = socket(PF_UNIX, SOCK_STREAM, 0);
if (fd < 0) {
-
perror
("socket");
+
PERROR
("socket");
ret = fd;
goto error;
}
ret = fd;
goto error;
}
@@
-168,7
+167,10
@@
int lttcomm_connect_unix_sock(const char *pathname)
return fd;
error_connect:
return fd;
error_connect:
- close(fd);
+ closeret = close(fd);
+ if (closeret) {
+ PERROR("close");
+ }
error:
return ret;
}
error:
return ret;
}
@@
-186,7
+188,7
@@
int lttcomm_accept_unix_sock(int sock)
/* Blocking call */
new_fd = accept(sock, (struct sockaddr *) &sun, &len);
if (new_fd < 0) {
/* Blocking call */
new_fd = accept(sock, (struct sockaddr *) &sun, &len);
if (new_fd < 0) {
-
perror
("accept");
+
PERROR
("accept");
}
return new_fd;
}
return new_fd;
@@
-204,7
+206,7
@@
int lttcomm_create_unix_sock(const char *pathname)
/* Create server socket */
if ((fd = socket(PF_UNIX, SOCK_STREAM, 0)) < 0) {
/* Create server socket */
if ((fd = socket(PF_UNIX, SOCK_STREAM, 0)) < 0) {
-
perror
("socket");
+
PERROR
("socket");
goto error;
}
goto error;
}
@@
-217,7
+219,7
@@
int lttcomm_create_unix_sock(const char *pathname)
(void) unlink(pathname);
ret = bind(fd, (struct sockaddr *) &sun, sizeof(sun));
if (ret < 0) {
(void) unlink(pathname);
ret = bind(fd, (struct sockaddr *) &sun, sizeof(sun));
if (ret < 0) {
-
perror
("bind");
+
PERROR
("bind");
goto error;
}
goto error;
}
@@
-236,7
+238,7
@@
int lttcomm_listen_unix_sock(int sock)
ret = listen(sock, LTTNG_SESSIOND_COMM_MAX_LISTEN);
if (ret < 0) {
ret = listen(sock, LTTNG_SESSIOND_COMM_MAX_LISTEN);
if (ret < 0) {
-
perror
("listen");
+
PERROR
("listen");
}
return ret;
}
return ret;
@@
-263,7
+265,7
@@
ssize_t lttcomm_recv_unix_sock(int sock, void *buf, size_t len)
ret = recvmsg(sock, &msg, MSG_WAITALL);
if (ret < 0) {
ret = recvmsg(sock, &msg, MSG_WAITALL);
if (ret < 0) {
-
perror
("recvmsg");
+
PERROR
("recvmsg");
}
return ret;
}
return ret;
@@
-289,7
+291,7
@@
ssize_t lttcomm_send_unix_sock(int sock, void *buf, size_t len)
ret = sendmsg(sock, &msg, 0);
if (ret < 0) {
ret = sendmsg(sock, &msg, 0);
if (ret < 0) {
-
perror
("sendmsg");
+
PERROR
("sendmsg");
}
return ret;
}
return ret;
@@
-300,15
+302,18
@@
ssize_t lttcomm_send_unix_sock(int sock, void *buf, size_t len)
*/
int lttcomm_close_unix_sock(int sock)
{
*/
int lttcomm_close_unix_sock(int sock)
{
- int ret;
+ int ret
, closeret
;
/* Shutdown receptions and transmissions */
ret = shutdown(sock, SHUT_RDWR);
if (ret < 0) {
/* Shutdown receptions and transmissions */
ret = shutdown(sock, SHUT_RDWR);
if (ret < 0) {
-
perror
("shutdown");
+
PERROR
("shutdown");
}
}
- close(sock);
+ closeret = close(sock);
+ if (closeret) {
+ PERROR("close");
+ }
return ret;
}
return ret;
}
@@
-351,7
+356,7
@@
ssize_t lttcomm_send_fds_unix_sock(int sock, int *fds, size_t nb_fd)
ret = sendmsg(sock, &msg, 0);
if (ret < 0) {
ret = sendmsg(sock, &msg, 0);
if (ret < 0) {
-
perror
("sendmsg");
+
PERROR
("sendmsg");
}
return ret;
}
}
return ret;
}
@@
-386,7
+391,7
@@
ssize_t lttcomm_recv_fds_unix_sock(int sock, int *fds, size_t nb_fd)
ret = recvmsg(sock, &msg, 0);
if (ret < 0) {
ret = recvmsg(sock, &msg, 0);
if (ret < 0) {
-
perror
("recvmsg fds");
+
PERROR
("recvmsg fds");
goto end;
}
if (ret != 1) {
goto end;
}
if (ret != 1) {
@@
-412,7
+417,7
@@
ssize_t lttcomm_recv_fds_unix_sock(int sock, int *fds, size_t nb_fd)
}
if (cmsg->cmsg_len != CMSG_LEN(sizeof_fds)) {
fprintf(stderr, "Error: Received %zu bytes of ancillary data, expected %zu\n",
}
if (cmsg->cmsg_len != CMSG_LEN(sizeof_fds)) {
fprintf(stderr, "Error: Received %zu bytes of ancillary data, expected %zu\n",
-
cmsg->cmsg_len,
CMSG_LEN(sizeof_fds));
+
(size_t) cmsg->cmsg_len, (size_t)
CMSG_LEN(sizeof_fds));
ret = -1;
goto end;
}
ret = -1;
goto end;
}
@@
-430,12
+435,14
@@
end:
ssize_t lttcomm_send_creds_unix_sock(int sock, void *buf, size_t len)
{
struct msghdr msg;
ssize_t lttcomm_send_creds_unix_sock(int sock, void *buf, size_t len)
{
struct msghdr msg;
- struct cmsghdr *cmptr;
struct iovec iov[1];
ssize_t ret = -1;
struct iovec iov[1];
ssize_t ret = -1;
- struct ucred *creds;
- size_t sizeof_cred = sizeof(struct ucred);
+#ifdef __linux__
+ struct cmsghdr *cmptr;
+ size_t sizeof_cred = sizeof(lttng_sock_cred);
char anc_buf[CMSG_SPACE(sizeof_cred)];
char anc_buf[CMSG_SPACE(sizeof_cred)];
+ lttng_sock_cred *creds;
+#endif /* __linux__ */
memset(&msg, 0, sizeof(msg));
memset(&msg, 0, sizeof(msg));
@@
-444,23
+451,25
@@
ssize_t lttcomm_send_creds_unix_sock(int sock, void *buf, size_t len)
msg.msg_iov = iov;
msg.msg_iovlen = 1;
msg.msg_iov = iov;
msg.msg_iovlen = 1;
+#ifdef __linux__
msg.msg_control = (caddr_t) anc_buf;
msg.msg_controllen = CMSG_LEN(sizeof_cred);
cmptr = CMSG_FIRSTHDR(&msg);
cmptr->cmsg_level = SOL_SOCKET;
msg.msg_control = (caddr_t) anc_buf;
msg.msg_controllen = CMSG_LEN(sizeof_cred);
cmptr = CMSG_FIRSTHDR(&msg);
cmptr->cmsg_level = SOL_SOCKET;
- cmptr->cmsg_type =
SCM_CREDENTIAL
S;
+ cmptr->cmsg_type =
LTTNG_SOCK_CRED
S;
cmptr->cmsg_len = CMSG_LEN(sizeof_cred);
cmptr->cmsg_len = CMSG_LEN(sizeof_cred);
- creds = (
struct ucred
*) CMSG_DATA(cmptr);
+ creds = (
lttng_sock_cred
*) CMSG_DATA(cmptr);
- creds->uid = geteuid();
- creds->gid = getegid();
- creds->pid = getpid();
+ LTTNG_SOCK_SET_UID_CRED(creds, geteuid());
+ LTTNG_SOCK_SET_GID_CRED(creds, getegid());
+ LTTNG_SOCK_SET_PID_CRED(creds, getpid());
+#endif /* __linux__ */
ret = sendmsg(sock, &msg, 0);
if (ret < 0) {
ret = sendmsg(sock, &msg, 0);
if (ret < 0) {
-
perror
("sendmsg");
+
PERROR
("sendmsg");
}
return ret;
}
return ret;
@@
-472,14
+481,16
@@
ssize_t lttcomm_send_creds_unix_sock(int sock, void *buf, size_t len)
* Returns the size of received data, or negative error value.
*/
ssize_t lttcomm_recv_creds_unix_sock(int sock, void *buf, size_t len,
* Returns the size of received data, or negative error value.
*/
ssize_t lttcomm_recv_creds_unix_sock(int sock, void *buf, size_t len,
-
struct u
cred *creds)
+
lttng_sock_
cred *creds)
{
struct msghdr msg;
{
struct msghdr msg;
- struct cmsghdr *cmptr;
struct iovec iov[1];
ssize_t ret;
struct iovec iov[1];
ssize_t ret;
- size_t sizeof_cred = sizeof(struct ucred);
+#ifdef __linux__
+ struct cmsghdr *cmptr;
+ size_t sizeof_cred = sizeof(lttng_sock_cred);
char anc_buf[CMSG_SPACE(sizeof_cred)];
char anc_buf[CMSG_SPACE(sizeof_cred)];
+#endif /* __linux__ */
memset(&msg, 0, sizeof(msg));
memset(&msg, 0, sizeof(msg));
@@
-495,15
+506,18
@@
ssize_t lttcomm_recv_creds_unix_sock(int sock, void *buf, size_t len,
msg.msg_iov = iov;
msg.msg_iovlen = 1;
msg.msg_iov = iov;
msg.msg_iovlen = 1;
+#ifdef __linux__
msg.msg_control = anc_buf;
msg.msg_controllen = sizeof(anc_buf);
msg.msg_control = anc_buf;
msg.msg_controllen = sizeof(anc_buf);
+#endif /* __linux__ */
ret = recvmsg(sock, &msg, 0);
if (ret < 0) {
ret = recvmsg(sock, &msg, 0);
if (ret < 0) {
-
perror
("recvmsg fds");
+
PERROR
("recvmsg fds");
goto end;
}
goto end;
}
+#ifdef __linux__
if (msg.msg_flags & MSG_CTRUNC) {
fprintf(stderr, "Error: Control message truncated.\n");
ret = -1;
if (msg.msg_flags & MSG_CTRUNC) {
fprintf(stderr, "Error: Control message truncated.\n");
ret = -1;
@@
-518,7
+532,7
@@
ssize_t lttcomm_recv_creds_unix_sock(int sock, void *buf, size_t len,
}
if (cmptr->cmsg_level != SOL_SOCKET ||
}
if (cmptr->cmsg_level != SOL_SOCKET ||
- cmptr->cmsg_type !=
SCM_CREDENTIAL
S) {
+ cmptr->cmsg_type !=
LTTNG_SOCK_CRED
S) {
fprintf(stderr, "Didn't received any credentials\n");
ret = -1;
goto end;
fprintf(stderr, "Didn't received any credentials\n");
ret = -1;
goto end;
@@
-526,12
+540,24
@@
ssize_t lttcomm_recv_creds_unix_sock(int sock, void *buf, size_t len,
if (cmptr->cmsg_len != CMSG_LEN(sizeof_cred)) {
fprintf(stderr, "Error: Received %zu bytes of ancillary data, expected %zu\n",
if (cmptr->cmsg_len != CMSG_LEN(sizeof_cred)) {
fprintf(stderr, "Error: Received %zu bytes of ancillary data, expected %zu\n",
-
cmptr->cmsg_len,
CMSG_LEN(sizeof_cred));
+
(size_t) cmptr->cmsg_len, (size_t)
CMSG_LEN(sizeof_cred));
ret = -1;
goto end;
}
memcpy(creds, CMSG_DATA(cmptr), sizeof_cred);
ret = -1;
goto end;
}
memcpy(creds, CMSG_DATA(cmptr), sizeof_cred);
+#elif defined(__FreeBSD__)
+ {
+ int peer_ret;
+
+ peer_ret = getpeereid(sock, &creds->uid, &creds->gid);
+ if (peer_ret != 0) {
+ return peer_ret;
+ }
+ }
+#else
+#error "Please implement credential support for your OS."
+#endif /* __linux__ */
end:
return ret;
end:
return ret;
@@
-540,6
+566,7
@@
end:
/*
* Set socket option to use credentials passing.
*/
/*
* Set socket option to use credentials passing.
*/
+#ifdef __linux__
int lttcomm_setsockopt_creds_unix_sock(int sock)
{
int ret, on = 1;
int lttcomm_setsockopt_creds_unix_sock(int sock)
{
int ret, on = 1;
@@
-547,8
+574,15
@@
int lttcomm_setsockopt_creds_unix_sock(int sock)
/* Set socket for credentials retrieval */
ret = setsockopt(sock, SOL_SOCKET, SO_PASSCRED, &on, sizeof(on));
if (ret < 0) {
/* Set socket for credentials retrieval */
ret = setsockopt(sock, SOL_SOCKET, SO_PASSCRED, &on, sizeof(on));
if (ret < 0) {
-
perror
("setsockopt creds unix sock");
+
PERROR
("setsockopt creds unix sock");
}
}
-
return ret;
}
return ret;
}
+#elif defined(__FreeBSD__)
+int lttcomm_setsockopt_creds_unix_sock(int sock)
+{
+ return 0;
+}
+#else
+#error "Please implement credential support for your OS."
+#endif /* __linux__ */
This page took
0.027382 seconds
and
4
git commands to generate.