mirror of
https://github.com/systemd/systemd.git
synced 2025-03-22 06:50:18 +03:00
journal: unbreak sd_journal_sendv
Borked since commit 3ee897d6c2401effbc82f5eef35fce405781d6c8 Author: Lennart Poettering <lennart@poettering.net> Date: Wed Sep 23 01:00:04 2015 +0200 tree-wide: port more code to use send_one_fd() and receive_one_fd() because here our fd is not connected and we need to specify the address.
This commit is contained in:
parent
85049096c7
commit
726f4c4738
@ -870,16 +870,24 @@ int getpeersec(int fd, char **ret) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
int send_one_fd(int transport_fd, int fd, int flags) {
|
||||
int send_one_fd_sa(
|
||||
int transport_fd,
|
||||
int fd,
|
||||
const struct sockaddr *sa, socklen_t len,
|
||||
int flags) {
|
||||
|
||||
union {
|
||||
struct cmsghdr cmsghdr;
|
||||
uint8_t buf[CMSG_SPACE(sizeof(int))];
|
||||
} control = {};
|
||||
struct cmsghdr *cmsg;
|
||||
|
||||
struct msghdr mh = {
|
||||
.msg_name = (struct sockaddr*) sa,
|
||||
.msg_namelen = len,
|
||||
.msg_control = &control,
|
||||
.msg_controllen = sizeof(control),
|
||||
};
|
||||
struct cmsghdr *cmsg;
|
||||
|
||||
assert(transport_fd >= 0);
|
||||
assert(fd >= 0);
|
||||
|
@ -128,7 +128,11 @@ int ip_tos_from_string(const char *s);
|
||||
int getpeercred(int fd, struct ucred *ucred);
|
||||
int getpeersec(int fd, char **ret);
|
||||
|
||||
int send_one_fd(int transport_fd, int fd, int flags);
|
||||
int send_one_fd_sa(int transport_fd,
|
||||
int fd,
|
||||
const struct sockaddr *sa, socklen_t len,
|
||||
int flags);
|
||||
#define send_one_fd(transport_fd, fd, flags) send_one_fd_sa(transport_fd, fd, NULL, 0, flags)
|
||||
int receive_one_fd(int transport_fd, int flags);
|
||||
|
||||
#define CMSG_FOREACH(cmsg, mh) \
|
||||
|
@ -337,7 +337,7 @@ _public_ int sd_journal_sendv(const struct iovec *iov, int n) {
|
||||
return r;
|
||||
}
|
||||
|
||||
return send_one_fd(fd, buffer_fd, 0);
|
||||
return send_one_fd_sa(fd, buffer_fd, mh.msg_name, mh.msg_namelen, 0);
|
||||
}
|
||||
|
||||
static int fill_iovec_perror_and_send(const char *message, int skip, struct iovec iov[]) {
|
||||
|
Loading…
x
Reference in New Issue
Block a user