chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bus: internalize a lot of protocol definitions
[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 60d9ad41c3bda2af39b906562f2a6b8660a72ae2..69f78c9a58f599e9aa55173a435b56363efb4be0 100644
(file)
--- a/
src/libsystemd-bus/bus-socket.c
+++ b/
src/libsystemd-bus/bus-socket.c
@@
-611,7
+611,7
@@
int bus_socket_setup(sd_bus *b) {
enable = !b->bus_client;
setsockopt(b->input_fd, SOL_SOCKET, SO_PASSCRED, &enable, sizeof(enable));
enable = !b->bus_client;
setsockopt(b->input_fd, SOL_SOCKET, SO_PASSCRED, &enable, sizeof(enable));
- enable = !b->bus_client && (b->
hello_flags & KDBUS_HELLO
_ATTACH_SECLABEL);
+ 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 */
@@
-874,10
+874,10
@@
static int bus_socket_read_message_need(sd_bus *bus, size_t *need) {
b = ((const uint32_t*) bus->rbuffer)[3];
e = ((const uint8_t*) bus->rbuffer)[0];
b = ((const uint32_t*) bus->rbuffer)[3];
e = ((const uint8_t*) bus->rbuffer)[0];
- if (e ==
SD_
BUS_LITTLE_ENDIAN) {
+ if (e == BUS_LITTLE_ENDIAN) {
a = le32toh(a);
b = le32toh(b);
a = le32toh(a);
b = le32toh(b);
- } else if (e ==
SD_
BUS_BIG_ENDIAN) {
+ } else if (e == BUS_BIG_ENDIAN) {
a = be32toh(a);
b = be32toh(b);
} else
a = be32toh(a);
b = be32toh(b);
} else
@@
-891,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);
@@
-926,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;
@@
-947,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);
@@
-955,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)
@@
-1045,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;
}