chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
libsystemd-bus: catch up with latest kdbus changes
[elogind.git]
/
src
/
libsystemd-bus
/
bus-socket.c
diff --git
a/src/libsystemd-bus/bus-socket.c
b/src/libsystemd-bus/bus-socket.c
index bce81aeffce1b8c9584bf178b20f651ac1ba1a27..d7d3b4dac5aa2bea3c4b21e40de7f3edc4fb5423 100644
(file)
--- a/
src/libsystemd-bus/bus-socket.c
+++ b/
src/libsystemd-bus/bus-socket.c
@@
-58,7
+58,7
@@
static void iovec_advance(struct iovec iov[], unsigned *idx, size_t size) {
}
}
}
}
-static
void
append_iovec(sd_bus_message *m, const void *p, size_t sz) {
+static
int
append_iovec(sd_bus_message *m, const void *p, size_t sz) {
assert(m);
assert(p);
assert(sz > 0);
assert(m);
assert(p);
assert(sz > 0);
@@
-66,29
+66,55
@@
static void append_iovec(sd_bus_message *m, const void *p, size_t sz) {
m->iovec[m->n_iovec].iov_base = (void*) p;
m->iovec[m->n_iovec].iov_len = sz;
m->n_iovec++;
m->iovec[m->n_iovec].iov_base = (void*) p;
m->iovec[m->n_iovec].iov_len = sz;
m->n_iovec++;
+
+ return 0;
}
}
-static void bus_message_setup_iovec(sd_bus_message *m) {
+static int bus_message_setup_iovec(sd_bus_message *m) {
+ struct bus_body_part *part;
+ unsigned n, i;
+ int r;
+
assert(m);
assert(m->sealed);
if (m->n_iovec > 0)
assert(m);
assert(m->sealed);
if (m->n_iovec > 0)
- return;
+ return
0
;
- a
ppend_iovec(m, m->header, sizeof(*m->header)
);
+ a
ssert(!m->iovec
);
- if (m->fields) {
- append_iovec(m, m->fields, m->header->fields_size);
+ n = 1 + m->n_body_parts;
+ if (n < ELEMENTSOF(m->iovec_fixed))
+ m->iovec = m->iovec_fixed;
+ else {
+ m->iovec = new(struct iovec, n);
+ if (!m->iovec) {
+ r = -ENOMEM;
+ goto fail;
+ }
+ }
- if (m->header->fields_size % 8 != 0) {
- static const uint8_t padding[7] = {};
+ r = append_iovec(m, m->header, BUS_MESSAGE_BODY_BEGIN(m));
+ if (r < 0)
+ goto fail;
- append_iovec(m, padding, 8 - (m->header->fields_size % 8));
- }
+ MESSAGE_FOREACH_PART(part, i, m) {
+ r = bus_body_part_map(part);
+ if (r < 0)
+ goto fail;
+
+ r = append_iovec(m, part->data, part->size);
+ if (r < 0)
+ goto fail;
}
}
- if (m->body)
- append_iovec(m, m->body, m->header->body_size);
+ assert(n == m->n_iovec);
+
+ return 0;
+
+fail:
+ m->poisoned = true;
+ return r;
}
bool bus_socket_auth_needs_write(sd_bus *b) {
}
bool bus_socket_auth_needs_write(sd_bus *b) {
@@
-155,7
+181,7
@@
static int bus_socket_auth_verify_client(sd_bus *b) {
if (!e)
return 0;
if (!e)
return 0;
- if (b->
negotiate_fds
) {
+ if (b->
hello_flags & KDBUS_HELLO_ACCEPT_FD
) {
f = memmem(e + 2, b->rbuffer_size - (e - (char*) b->rbuffer) - 2, "\r\n", 2);
if (!f)
return 0;
f = memmem(e + 2, b->rbuffer_size - (e - (char*) b->rbuffer) - 2, "\r\n", 2);
if (!f)
return 0;
@@
-438,7
+464,7
@@
static int bus_socket_auth_verify_server(sd_bus *b) {
r = bus_socket_auth_write_ok(b);
}
} else if (line_equals(line, l, "NEGOTIATE_UNIX_FD")) {
r = bus_socket_auth_write_ok(b);
}
} else if (line_equals(line, l, "NEGOTIATE_UNIX_FD")) {
- if (b->auth == _BUS_AUTH_INVALID || !
b->negotiate_fds
)
+ if (b->auth == _BUS_AUTH_INVALID || !
(b->hello_flags & KDBUS_HELLO_ACCEPT_FD)
)
r = bus_socket_auth_write(b, "ERROR\r\n");
else {
b->can_fds = true;
r = bus_socket_auth_write(b, "ERROR\r\n");
else {
b->can_fds = true;
@@
-574,7
+600,7
@@
static int bus_socket_read_auth(sd_bus *b) {
return 1;
}
return 1;
}
-
static
int bus_socket_setup(sd_bus *b) {
+int bus_socket_setup(sd_bus *b) {
int enable;
socklen_t l;
int enable;
socklen_t l;
@@
-584,6
+610,8
@@
static int bus_socket_setup(sd_bus *b) {
* socket, just in case. */
enable = !b->bus_client;
setsockopt(b->input_fd, SOL_SOCKET, SO_PASSCRED, &enable, sizeof(enable));
* socket, just in case. */
enable = !b->bus_client;
setsockopt(b->input_fd, SOL_SOCKET, SO_PASSCRED, &enable, sizeof(enable));
+
+ enable = !b->bus_client && (b->attach_flags & KDBUS_ATTACH_SECLABEL);
setsockopt(b->input_fd, SOL_SOCKET, SO_PASSSEC, &enable, sizeof(enable));
/* Increase the buffers to a MB */
setsockopt(b->input_fd, SOL_SOCKET, SO_PASSSEC, &enable, sizeof(enable));
/* Increase the buffers to a MB */
@@
-625,7
+653,7
@@
static int bus_socket_start_auth_client(sd_bus *b) {
if (!b->auth_buffer)
return -ENOMEM;
if (!b->auth_buffer)
return -ENOMEM;
- if (b->
negotiate_fds
)
+ if (b->
hello_flags & KDBUS_HELLO_ACCEPT_FD
)
auth_suffix = "\r\nNEGOTIATE_UNIX_FD\r\nBEGIN\r\n";
else
auth_suffix = "\r\nBEGIN\r\n";
auth_suffix = "\r\nNEGOTIATE_UNIX_FD\r\nBEGIN\r\n";
else
auth_suffix = "\r\nBEGIN\r\n";
@@
-640,18
+668,18
@@
static int bus_socket_start_auth_client(sd_bus *b) {
return bus_socket_write_auth(b);
}
return bus_socket_write_auth(b);
}
-
static
int bus_socket_start_auth(sd_bus *b) {
+int bus_socket_start_auth(sd_bus *b) {
assert(b);
b->state = BUS_AUTHENTICATING;
b->auth_timeout = now(CLOCK_MONOTONIC) + BUS_DEFAULT_TIMEOUT;
if (sd_is_socket(b->input_fd, AF_UNIX, 0, 0) <= 0)
assert(b);
b->state = BUS_AUTHENTICATING;
b->auth_timeout = now(CLOCK_MONOTONIC) + BUS_DEFAULT_TIMEOUT;
if (sd_is_socket(b->input_fd, AF_UNIX, 0, 0) <= 0)
- b->
negotiate_fds = false
;
+ b->
hello_flags &= ~KDBUS_HELLO_ACCEPT_FD
;
if (b->output_fd != b->input_fd)
if (sd_is_socket(b->output_fd, AF_UNIX, 0, 0) <= 0)
if (b->output_fd != b->input_fd)
if (sd_is_socket(b->output_fd, AF_UNIX, 0, 0) <= 0)
- b->
negotiate_fds = false
;
+ b->
hello_flags &= ~KDBUS_HELLO_ACCEPT_FD
;
if (b->is_server)
return bus_socket_read_auth(b);
if (b->is_server)
return bus_socket_read_auth(b);
@@
-756,6
+784,7
@@
int bus_socket_write_message(sd_bus *bus, sd_bus_message *m, size_t *idx) {
ssize_t k;
size_t n;
unsigned j;
ssize_t k;
size_t n;
unsigned j;
+ int r;
assert(bus);
assert(m);
assert(bus);
assert(m);
@@
-765,7
+794,9
@@
int bus_socket_write_message(sd_bus *bus, sd_bus_message *m, size_t *idx) {
if (*idx >= BUS_MESSAGE_SIZE(m))
return 0;
if (*idx >= BUS_MESSAGE_SIZE(m))
return 0;
- bus_message_setup_iovec(m);
+ r = bus_message_setup_iovec(m);
+ if (r < 0)
+ return r;
n = m->n_iovec * sizeof(struct iovec);
iov = alloca(n);
n = m->n_iovec * sizeof(struct iovec);
iov = alloca(n);
@@
-860,16
+891,19
@@
static int bus_socket_read_message_need(sd_bus *bus, size_t *need) {
return 0;
}
return 0;
}
-static int bus_socket_make_message(sd_bus *bus, size_t size
, sd_bus_message **m
) {
+static int bus_socket_make_message(sd_bus *bus, size_t size) {
sd_bus_message *t;
void *b;
int r;
assert(bus);
sd_bus_message *t;
void *b;
int r;
assert(bus);
- assert(m);
assert(bus->rbuffer_size >= size);
assert(bus->state == BUS_RUNNING || bus->state == BUS_HELLO);
assert(bus->rbuffer_size >= size);
assert(bus->state == BUS_RUNNING || bus->state == BUS_HELLO);
+ r = bus_rqueue_make_room(bus);
+ if (r < 0)
+ return r;
+
if (bus->rbuffer_size > size) {
b = memdup((const uint8_t*) bus->rbuffer + size,
bus->rbuffer_size - size);
if (bus->rbuffer_size > size) {
b = memdup((const uint8_t*) bus->rbuffer + size,
bus->rbuffer_size - size);
@@
-878,7
+912,8
@@
static int bus_socket_make_message(sd_bus *bus, size_t size, sd_bus_message **m)
} else
b = NULL;
} else
b = NULL;
- r = bus_message_from_malloc(bus->rbuffer, size,
+ r = bus_message_from_malloc(bus,
+ bus->rbuffer, size,
bus->fds, bus->n_fds,
bus->ucred_valid ? &bus->ucred : NULL,
bus->label[0] ? bus->label : NULL,
bus->fds, bus->n_fds,
bus->ucred_valid ? &bus->ucred : NULL,
bus->label[0] ? bus->label : NULL,
@@
-894,11
+929,12
@@
static int bus_socket_make_message(sd_bus *bus, size_t size, sd_bus_message **m)
bus->fds = NULL;
bus->n_fds = 0;
bus->fds = NULL;
bus->n_fds = 0;
- *m = t;
+ bus->rqueue[bus->rqueue_size++] = t;
+
return 1;
}
return 1;
}
-int bus_socket_read_message(sd_bus *bus
, sd_bus_message **m
) {
+int bus_socket_read_message(sd_bus *bus) {
struct msghdr mh;
struct iovec iov;
ssize_t k;
struct msghdr mh;
struct iovec iov;
ssize_t k;
@@
-915,7
+951,6
@@
int bus_socket_read_message(sd_bus *bus, sd_bus_message **m) {
bool handle_cmsg = false;
assert(bus);
bool handle_cmsg = false;
assert(bus);
- assert(m);
assert(bus->state == BUS_RUNNING || bus->state == BUS_HELLO);
r = bus_socket_read_message_need(bus, &need);
assert(bus->state == BUS_RUNNING || bus->state == BUS_HELLO);
r = bus_socket_read_message_need(bus, &need);
@@
-923,7
+958,7
@@
int bus_socket_read_message(sd_bus *bus, sd_bus_message **m) {
return r;
if (bus->rbuffer_size >= need)
return r;
if (bus->rbuffer_size >= need)
- return bus_socket_make_message(bus, need
, m
);
+ return bus_socket_make_message(bus, need);
b = realloc(bus->rbuffer, need);
if (!b)
b = realloc(bus->rbuffer, need);
if (!b)
@@
-1013,7
+1048,7
@@
int bus_socket_read_message(sd_bus *bus, sd_bus_message **m) {
return r;
if (bus->rbuffer_size >= need)
return r;
if (bus->rbuffer_size >= need)
- return bus_socket_make_message(bus, need
, m
);
+ return bus_socket_make_message(bus, need);
return 1;
}
return 1;
}