projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: Use PERROR all across lttng-tools, never make it quiet
[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 f133d5bfbabe1892c868c6ccb7d6784cc707ac2f..8a5ff1d3f10520efb26bef784dc7847fd7fba033 100644
(file)
--- a/
src/common/sessiond-comm/sessiond-comm.c
+++ b/
src/common/sessiond-comm/sessiond-comm.c
@@
-24,10
+24,12
@@
#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"
@@
-140,12
+142,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;
}
@@
-167,7
+168,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;
}
@@
-185,7
+189,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;
@@
-203,7
+207,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;
}
@@
-216,7
+220,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;
}
@@
-235,7
+239,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;
@@
-262,7
+266,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;
@@
-288,7
+292,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;
@@
-299,15
+303,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;
}
@@
-350,7
+357,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;
}
@@
-385,7
+392,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) {
@@
-411,7
+418,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",
-
(size_t) cmsg->cmsg_len, (size_t)
CMSG_LEN(sizeof_fds));
+
cmsg->cmsg_len,
CMSG_LEN(sizeof_fds));
ret = -1;
goto end;
}
ret = -1;
goto end;
}
@@
-432,9
+439,9
@@
ssize_t lttcomm_send_creds_unix_sock(int sock, void *buf, size_t len)
struct cmsghdr *cmptr;
struct iovec iov[1];
ssize_t ret = -1;
struct cmsghdr *cmptr;
struct iovec iov[1];
ssize_t ret = -1;
- size_t sizeof_cred = sizeof(lttng_sock_cred);
+ struct ucred *creds;
+ size_t sizeof_cred = sizeof(struct ucred);
char anc_buf[CMSG_SPACE(sizeof_cred)];
char anc_buf[CMSG_SPACE(sizeof_cred)];
- lttng_sock_cred *creds;
memset(&msg, 0, sizeof(msg));
memset(&msg, 0, sizeof(msg));
@@
-448,18
+455,18
@@
ssize_t lttcomm_send_creds_unix_sock(int sock, void *buf, size_t len)
cmptr = CMSG_FIRSTHDR(&msg);
cmptr->cmsg_level = SOL_SOCKET;
cmptr = CMSG_FIRSTHDR(&msg);
cmptr->cmsg_level = SOL_SOCKET;
- cmptr->cmsg_type =
LTTNG_SOCK_CRED
S;
+ cmptr->cmsg_type =
SCM_CREDENTIAL
S;
cmptr->cmsg_len = CMSG_LEN(sizeof_cred);
cmptr->cmsg_len = CMSG_LEN(sizeof_cred);
- creds = (
lttng_sock_cred
*) CMSG_DATA(cmptr);
+ creds = (
struct ucred
*) CMSG_DATA(cmptr);
-
LTTNG_SOCK_SET_UID_CRED(creds, geteuid()
);
-
LTTNG_SOCK_SET_GID_CRED(creds, getegid()
);
-
LTTNG_SOCK_SET_PID_CRED(creds, getpid()
);
+
creds->uid = geteuid(
);
+
creds->gid = getegid(
);
+
creds->pid = getpid(
);
ret = sendmsg(sock, &msg, 0);
if (ret < 0) {
ret = sendmsg(sock, &msg, 0);
if (ret < 0) {
-
perror
("sendmsg");
+
PERROR
("sendmsg");
}
return ret;
}
return ret;
@@
-471,13
+478,13
@@
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,
-
lttng_sock_
cred *creds)
+
struct u
cred *creds)
{
struct msghdr msg;
struct cmsghdr *cmptr;
struct iovec iov[1];
ssize_t ret;
{
struct msghdr msg;
struct cmsghdr *cmptr;
struct iovec iov[1];
ssize_t ret;
- size_t sizeof_cred = sizeof(
lttng_sock_
cred);
+ size_t sizeof_cred = sizeof(
struct u
cred);
char anc_buf[CMSG_SPACE(sizeof_cred)];
memset(&msg, 0, sizeof(msg));
char anc_buf[CMSG_SPACE(sizeof_cred)];
memset(&msg, 0, sizeof(msg));
@@
-499,7
+506,7
@@
ssize_t lttcomm_recv_creds_unix_sock(int sock, void *buf, size_t len,
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;
}
@@
-517,7
+524,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 !=
LTTNG_SOCK_CRED
S) {
+ cmptr->cmsg_type !=
SCM_CREDENTIAL
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;
@@
-525,7
+532,7
@@
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",
-
(size_t) cmptr->cmsg_len, (size_t)
CMSG_LEN(sizeof_cred));
+
cmptr->cmsg_len,
CMSG_LEN(sizeof_cred));
ret = -1;
goto end;
}
ret = -1;
goto end;
}
@@
-546,7
+553,7
@@
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;
This page took
0.029306 seconds
and
5
git commands to generate.