bus: implement basic name registration with kdbus

[elogind.git] / src / libsystemd-bus / bus-control.c

diff --git a/src/libsystemd-bus/bus-control.c b/src/libsystemd-bus/bus-control.c
index a0abccf1ddbbcda484c3e0107d27c9db950c2763..7c139cfd32cab7cb579e837056d58204ce7a9466 100644 (file)
--- a/src/libsystemd-bus/bus-control.c
+++ b/src/libsystemd-bus/bus-control.c
@@ -54,26 +54,46 @@ int sd_bus_request_name(sd_bus *bus, const char *name, int flags) {
                 return -EINVAL;
         if (!name)
                 return -EINVAL;
+        if (!bus->bus_client)
+                return -EINVAL;
 
-        r = sd_bus_call_method(
-                        bus,
-                        "org.freedesktop.DBus",
-                        "/",
-                        "org.freedesktop.DBus",
-                        "RequestName",
-                        NULL,
-                        &reply,
-                        "su",
-                        name,
-                        flags);
-        if (r < 0)
-                return r;
-
-        r = sd_bus_message_read(reply, "u", &ret);
-        if (r < 0)
-                return r;
-
-        return ret;
+        if (bus->is_kernel) {
+                struct kdbus_cmd_name *n;
+                size_t l;
+
+                l = strlen(name);
+                n = alloca(offsetof(struct kdbus_cmd_name, name) + l + 1);
+                n->size = offsetof(struct kdbus_cmd_name, name) + l + 1;
+                n->flags = flags;
+                n->id = 0;
+                memcpy(n->name, name, l+1);
+
+                r = ioctl(bus->input_fd, KDBUS_CMD_NAME_ACQUIRE, n);
+                if (r < 0)
+                        return -errno;
+
+                return n->flags;
+        } else {
+                r = sd_bus_call_method(
+                                bus,
+                                "org.freedesktop.DBus",
+                                "/",
+                                "org.freedesktop.DBus",
+                                "RequestName",
+                                NULL,
+                                &reply,
+                                "su",
+                                name,
+                                flags);
+                if (r < 0)
+                        return r;
+
+                r = sd_bus_message_read(reply, "u", &ret);
+                if (r < 0)
+                        return r;
+
+                return ret;
+        }
 }
 
 int sd_bus_release_name(sd_bus *bus, const char *name) {
@@ -85,23 +105,43 @@ int sd_bus_release_name(sd_bus *bus, const char *name) {
                 return -EINVAL;
         if (!name)
                 return -EINVAL;
+        if (!bus->bus_client)
+                return -EINVAL;
 
-        r = sd_bus_call_method(
-                        bus,
-                        "org.freedesktop.DBus",
-                        "/",
-                        "org.freedesktop.DBus",
-                        "ReleaseName",
-                        NULL,
-                        &reply,
-                        "s",
-                        name);
-        if (r < 0)
-                return r;
-
-        r = sd_bus_message_read(reply, "u", &ret);
-        if (r < 0)
-                return r;
+        if (bus->is_kernel) {
+                struct kdbus_cmd_name *n;
+                size_t l;
+
+                l = strlen(name);
+                n = alloca(offsetof(struct kdbus_cmd_name, name) + l + 1);
+                n->size = offsetof(struct kdbus_cmd_name, name) + l + 1;
+                n->flags = 0;
+                n->id = 0;
+                memcpy(n->name, name, l+1);
+
+                r = ioctl(bus->input_fd, KDBUS_CMD_NAME_RELEASE, n);
+                if (r < 0)
+                        return -errno;
+
+                return n->flags;
+        } else {
+                r = sd_bus_call_method(
+                                bus,
+                                "org.freedesktop.DBus",
+                                "/",
+                                "org.freedesktop.DBus",
+                                "ReleaseName",
+                                NULL,
+                                &reply,
+                                "s",
+                                name);
+                if (r < 0)
+                        return r;
+
+                r = sd_bus_message_read(reply, "u", &ret);
+                if (r < 0)
+                        return r;
+        }
 
         return ret;
 }