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: implement basic name registration with kdbus
[elogind.git]
/
src
/
libsystemd-bus
/
bus-kernel.c
diff --git
a/src/libsystemd-bus/bus-kernel.c
b/src/libsystemd-bus/bus-kernel.c
index add0bc11d013c83fec98a8eaf79348e49f4e4e28..9d0be7a1908090be4895cc77a79555449eaa4e93 100644
(file)
--- a/
src/libsystemd-bus/bus-kernel.c
+++ b/
src/libsystemd-bus/bus-kernel.c
@@
-158,6
+158,9
@@
int bus_kernel_take_fd(sd_bus *b) {
assert(b);
assert(b);
+ if (b->is_server)
+ return -EINVAL;
+
r = ioctl(b->input_fd, KDBUS_CMD_HELLO, &hello);
if (r < 0)
return -errno;
r = ioctl(b->input_fd, KDBUS_CMD_HELLO, &hello);
if (r < 0)
return -errno;
@@
-166,6
+169,7
@@
int bus_kernel_take_fd(sd_bus *b) {
return -ENOMEM;
b->is_kernel = true;
return -ENOMEM;
b->is_kernel = true;
+ b->bus_client = true;
r = bus_start_running(b);
if (r < 0)
r = bus_start_running(b);
if (r < 0)
@@
-180,6
+184,9
@@
int bus_kernel_connect(sd_bus *b) {
assert(b->output_fd < 0);
assert(b->kernel);
assert(b->output_fd < 0);
assert(b->kernel);
+ if (b->is_server)
+ return -EINVAL;
+
b->input_fd = open(b->kernel, O_RDWR|O_NOCTTY|O_CLOEXEC);
if (b->input_fd < 0)
return -errno;
b->input_fd = open(b->kernel, O_RDWR|O_NOCTTY|O_CLOEXEC);
if (b->input_fd < 0)
return -errno;
@@
-339,7
+346,7
@@
static int bus_kernel_make_message(sd_bus *bus, struct kdbus_msg *k, sd_bus_mess
int bus_kernel_read_message(sd_bus *bus, sd_bus_message **m) {
struct kdbus_msg *k;
int bus_kernel_read_message(sd_bus *bus, sd_bus_message **m) {
struct kdbus_msg *k;
- size_t sz = 1
28
;
+ size_t sz = 1
024
;
int r;
assert(bus);
int r;
assert(bus);