X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Flibsystemd-bus%2Fbus-control.c;h=a4dc9bf511e92584a1dc81c0e1cc4267e5410755;hb=9b29bb6853987bf6fef21531f69864fdfb39eb9a;hp=06afaf3c7698f9e931da3be0de9c467611d531bc;hpb=20902f3ec8b9d3f8949b15dbd961d3eeb37e9b7b;p=elogind.git
diff --git a/src/libsystemd-bus/bus-control.c b/src/libsystemd-bus/bus-control.c
index 06afaf3c7..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 .
***/
+#ifdef HAVE_VALGRIND_MEMCHECK_H
+#include
+#endif
+
#include
#include
@@ -27,6 +31,7 @@
#include "sd-bus.h"
#include "bus-internal.h"
#include "bus-message.h"
+#include "bus-control.h"
int sd_bus_get_unique_name(sd_bus *bus, const char **unique) {
int r;
@@ -45,7 +50,7 @@ int sd_bus_get_unique_name(sd_bus *bus, const char **unique) {
}
int sd_bus_request_name(sd_bus *bus, const char *name, int flags) {
- _cleanup_bus_message_unref_ sd_bus_message *m = NULL, *reply = NULL;
+ _cleanup_bus_message_unref_ sd_bus_message *reply = NULL;
uint32_t ret;
int r;
@@ -53,34 +58,53 @@ 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_message_new_method_call(
- bus,
- "org.freedesktop.DBus",
- "/",
- "org.freedesktop.DBus",
- "RequestName",
- &m);
- if (r < 0)
- return r;
-
- r = sd_bus_message_append(m, "su", name, flags);
- if (r < 0)
- return r;
-
- r = sd_bus_send_with_reply_and_block(bus, m, 0, NULL, &reply);
- 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) {
- _cleanup_bus_message_unref_ sd_bus_message *m = NULL, *reply = NULL;
+ _cleanup_bus_message_unref_ sd_bus_message *reply = NULL;
uint32_t ret;
int r;
@@ -88,34 +112,50 @@ 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_message_new_method_call(
- bus,
- "org.freedesktop.DBus",
- "/",
- "org.freedesktop.DBus",
- "ReleaseName",
- &m);
- if (r < 0)
- return r;
-
- r = sd_bus_message_append(m, "s", name);
- if (r < 0)
- return r;
-
- r = sd_bus_send_with_reply_and_block(bus, m, 0, NULL, &reply);
- 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;
}
int sd_bus_list_names(sd_bus *bus, char ***l) {
- _cleanup_bus_message_unref_ sd_bus_message *m1 = NULL, *reply1 = NULL, *m2 = NULL, *reply2 = NULL;
+ _cleanup_bus_message_unref_ sd_bus_message *reply1 = NULL, *reply2 = NULL;
char **x = NULL;
int r;
@@ -124,31 +164,27 @@ int sd_bus_list_names(sd_bus *bus, char ***l) {
if (!l)
return -EINVAL;
- r = sd_bus_message_new_method_call(
+ r = sd_bus_call_method(
bus,
"org.freedesktop.DBus",
"/",
"org.freedesktop.DBus",
"ListNames",
- &m1);
+ NULL,
+ &reply1,
+ NULL);
if (r < 0)
return r;
- r = sd_bus_message_new_method_call(
+ r = sd_bus_call_method(
bus,
"org.freedesktop.DBus",
"/",
"org.freedesktop.DBus",
"ListActivatableNames",
- &m2);
- if (r < 0)
- return r;
-
- r = sd_bus_send_with_reply_and_block(bus, m1, 0, NULL, &reply1);
- if (r < 0)
- return r;
-
- r = sd_bus_send_with_reply_and_block(bus, m2, 0, NULL, &reply2);
+ NULL,
+ &reply2,
+ NULL);
if (r < 0)
return r;
@@ -169,7 +205,7 @@ int sd_bus_list_names(sd_bus *bus, char ***l) {
}
int sd_bus_get_owner(sd_bus *bus, const char *name, char **owner) {
- _cleanup_bus_message_unref_ sd_bus_message *m = NULL, *reply = NULL;
+ _cleanup_bus_message_unref_ sd_bus_message *reply = NULL;
const char *found;
int r;
@@ -178,21 +214,16 @@ int sd_bus_get_owner(sd_bus *bus, const char *name, char **owner) {
if (!name)
return -EINVAL;
- r = sd_bus_message_new_method_call(
+ r = sd_bus_call_method(
bus,
"org.freedesktop.DBus",
"/",
"org.freedesktop.DBus",
"GetNameOwner",
- &m);
- if (r < 0)
- return r;
-
- r = sd_bus_message_append(m, "s", name);
- if (r < 0)
- return r;
-
- r = sd_bus_send_with_reply_and_block(bus, m, 0, NULL, &reply);
+ NULL,
+ &reply,
+ "s",
+ name);
if (r < 0)
return r;
@@ -214,7 +245,7 @@ int sd_bus_get_owner(sd_bus *bus, const char *name, char **owner) {
}
int sd_bus_get_owner_uid(sd_bus *bus, const char *name, uid_t *uid) {
- _cleanup_bus_message_unref_ sd_bus_message *m = NULL, *reply = NULL;
+ _cleanup_bus_message_unref_ sd_bus_message *reply = NULL;
uint32_t u;
int r;
@@ -225,21 +256,16 @@ int sd_bus_get_owner_uid(sd_bus *bus, const char *name, uid_t *uid) {
if (!uid)
return -EINVAL;
- r = sd_bus_message_new_method_call(
+ r = sd_bus_call_method(
bus,
"org.freedesktop.DBus",
"/",
"org.freedesktop.DBus",
"GetConnectionUnixUser",
- &m);
- if (r < 0)
- return r;
-
- r = sd_bus_message_append(m, "s", name);
- if (r < 0)
- return r;
-
- r = sd_bus_send_with_reply_and_block(bus, m, 0, NULL, &reply);
+ NULL,
+ &reply,
+ "s",
+ name);
if (r < 0)
return r;
@@ -252,7 +278,7 @@ int sd_bus_get_owner_uid(sd_bus *bus, const char *name, uid_t *uid) {
}
int sd_bus_get_owner_pid(sd_bus *bus, const char *name, pid_t *pid) {
- _cleanup_bus_message_unref_ sd_bus_message *m = NULL, *reply = NULL;
+ _cleanup_bus_message_unref_ sd_bus_message *reply = NULL;
uint32_t u;
int r;
@@ -263,21 +289,16 @@ int sd_bus_get_owner_pid(sd_bus *bus, const char *name, pid_t *pid) {
if (!pid)
return -EINVAL;
- r = sd_bus_message_new_method_call(
+ r = sd_bus_call_method(
bus,
"org.freedesktop.DBus",
"/",
"org.freedesktop.DBus",
"GetConnectionUnixProcessID",
- &m);
- if (r < 0)
- return r;
-
- r = sd_bus_message_append(m, "s", name);
- if (r < 0)
- return r;
-
- r = sd_bus_send_with_reply_and_block(bus, m, 0, NULL, &reply);
+ NULL,
+ &reply,
+ "s",
+ name);
if (r < 0)
return r;
@@ -292,54 +313,66 @@ int sd_bus_get_owner_pid(sd_bus *bus, const char *name, pid_t *pid) {
return 0;
}
-int sd_bus_add_match(sd_bus *bus, const char *match) {
- _cleanup_bus_message_unref_ sd_bus_message *m = NULL, *reply = NULL;
- int r;
-
- if (!bus)
- return -EINVAL;
- if (!match)
- return -EINVAL;
+int bus_add_match_internal(sd_bus *bus, const char *match) {
+ assert(bus);
+ assert(match);
- r = sd_bus_message_new_method_call(
+ return sd_bus_call_method(
bus,
"org.freedesktop.DBus",
"/",
"org.freedesktop.DBus",
"AddMatch",
- &m);
- if (r < 0)
- return r;
+ NULL,
+ NULL,
+ "s",
+ match);
+}
- r = sd_bus_message_append(m, "s", match);
- if (r < 0)
- return r;
+int bus_remove_match_internal(sd_bus *bus, const char *match) {
+ assert(bus);
+ assert(match);
- return sd_bus_send_with_reply_and_block(bus, m, 0, NULL, &reply);
+ return sd_bus_call_method(
+ bus,
+ "org.freedesktop.DBus",
+ "/",
+ "org.freedesktop.DBus",
+ "RemoveMatch",
+ NULL,
+ NULL,
+ "s",
+ match);
}
-int sd_bus_remove_match(sd_bus *bus, const char *match) {
- _cleanup_bus_message_unref_ sd_bus_message *m = NULL, *reply = NULL;
+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 (!match)
+ if (!name)
return -EINVAL;
- r = sd_bus_message_new_method_call(
- bus,
- "org.freedesktop.DBus",
- "/",
- "org.freedesktop.DBus",
- "RemoveMatch",
- &m);
+ 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_append(m, "s", match);
+ r = sd_bus_message_read(reply, "s", &mid);
if (r < 0)
return r;
- return sd_bus_send_with_reply_and_block(bus, m, 0, NULL, &reply);
+ return sd_id128_from_string(mid, machine);
}