X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Flibsystemd-bus%2Fbus-control.c;h=a4dc9bf511e92584a1dc81c0e1cc4267e5410755;hb=39887731d4a36292674f92effa30e5941419c201;hp=a0abccf1ddbbcda484c3e0107d27c9db950c2763;hpb=d4100e2444fc78156a205bbb05703b31063e1248;p=elogind.git

diff --git a/src/libsystemd-bus/bus-control.c b/src/libsystemd-bus/bus-control.c
index a0abccf1d..a4dc9bf51 100644
--- a/src/libsystemd-bus/bus-control.c
+++ b/src/libsystemd-bus/bus-control.c
@@ -19,6 +19,10 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
+#ifdef HAVE_VALGRIND_MEMCHECK_H
+#include <valgrind/memcheck.h>
+#endif
+
 #include <stddef.h>
 #include <errno.h>
 
@@ -54,26 +58,49 @@ 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 = alloca0(offsetof(struct kdbus_cmd_name, name) + l + 1);
+                n->size = offsetof(struct kdbus_cmd_name, name) + l + 1;
+                n->name_flags = flags;
+                memcpy(n->name, name, l+1);
+
+#ifdef HAVE_VALGRIND_MEMCHECK_H
+                VALGRIND_MAKE_MEM_DEFINED(n, n->size);
+#endif
+
+                r = ioctl(bus->input_fd, KDBUS_CMD_NAME_ACQUIRE, n);
+                if (r < 0)
+                        return -errno;
+
+                return n->name_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 +112,44 @@ 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 = alloca0(offsetof(struct kdbus_cmd_name, name) + l + 1);
+                n->size = offsetof(struct kdbus_cmd_name, name) + l + 1;
+                memcpy(n->name, name, l+1);
+
+#ifdef HAVE_VALGRIND_MEMCHECK_H
+                VALGRIND_MAKE_MEM_DEFINED(n, n->size);
+#endif
+                r = ioctl(bus->input_fd, KDBUS_CMD_NAME_RELEASE, n);
+                if (r < 0)
+                        return -errno;
+
+                return n->name_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;
 }
@@ -296,3 +344,35 @@ int bus_remove_match_internal(sd_bus *bus, const char *match) {
                         "s",
                         match);
 }
+
+int sd_bus_get_owner_machine_id(sd_bus *bus, const char *name, sd_id128_t *machine) {
+        _cleanup_bus_message_unref_ sd_bus_message *reply = NULL;
+        const char *mid;
+        int r;
+
+        if (!bus)
+                return -EINVAL;
+        if (!name)
+                return -EINVAL;
+
+        if (streq_ptr(name, bus->unique_name))
+                return sd_id128_get_machine(machine);
+
+        r = sd_bus_call_method(bus,
+                               name,
+                               "/",
+                               "org.freedesktop.DBus.Peer",
+                               "GetMachineId",
+                               NULL,
+                               &reply,
+                               NULL);
+
+        if (r < 0)
+                return r;
+
+        r = sd_bus_message_read(reply, "s", &mid);
+        if (r < 0)
+                return r;
+
+        return sd_id128_from_string(mid, machine);
+}