From c826cda421f0272275342173e16250adcdf6fbd4 Mon Sep 17 00:00:00 2001 From: Andrey Borzenkov Date: Sun, 6 Mar 2011 19:17:02 +0300 Subject: add org.freedesktop.DBus.Properies.Set method The patch adds framework for processing Set requests on properties and as first consumers allows setting of LogTarget and LogLevel on interface org.freedesktop.systemd1.Manager of org.freedesktop.systemd1. The code should be generic enough to allow processing of any property on other objects and interfaces as well. No systemctl visible interface is added so far. The LogTarget and LogLevel are meant for debugging in the first place; user interface can be added if other usage emerge. Set on systemwide systemd is restricted to root; I am not sure how session level access is controlled. --- src/dbus-manager.c | 32 ++++++++++++++++++++++++++++---- src/dbus.c | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++ src/dbus.h | 7 +++++++ 3 files changed, 87 insertions(+), 4 deletions(-) diff --git a/src/dbus-manager.c b/src/dbus-manager.c index 1a587197a5..7d4703b88b 100644 --- a/src/dbus-manager.c +++ b/src/dbus-manager.c @@ -156,8 +156,8 @@ " \n" \ " \n" \ " \n" \ - " \n" \ - " \n" \ + " \n" \ + " \n" \ " \n" \ " \n" \ " \n" \ @@ -252,6 +252,18 @@ static int bus_manager_append_log_target(Manager *m, DBusMessageIter *i, const c return 0; } +static int bus_manager_set_log_target(Manager *m, DBusMessageIter *i, const char *property) { + const char *t; + + assert(m); + assert(i); + assert(property); + + dbus_message_iter_get_basic(i, &t); + + return log_set_target_from_string(t); +} + static int bus_manager_append_log_level(Manager *m, DBusMessageIter *i, const char *property, void *data) { const char *t; @@ -267,6 +279,18 @@ static int bus_manager_append_log_level(Manager *m, DBusMessageIter *i, const ch return 0; } +static int bus_manager_set_log_level(Manager *m, DBusMessageIter *i, const char *property) { + const char *t; + + assert(m); + assert(i); + assert(property); + + dbus_message_iter_get_basic(i, &t); + + return log_set_max_level_from_string(t); +} + static int bus_manager_append_n_names(Manager *m, DBusMessageIter *i, const char *property, void *data) { uint32_t u; @@ -341,8 +365,8 @@ static DBusHandlerResult bus_manager_message_handler(DBusConnection *connection, { "org.freedesktop.systemd1.Manager", "InitRDTimestamp", bus_property_append_uint64, "t", &m->initrd_timestamp.realtime }, { "org.freedesktop.systemd1.Manager", "StartupTimestamp", bus_property_append_uint64, "t", &m->startup_timestamp.realtime }, { "org.freedesktop.systemd1.Manager", "FinishTimestamp", bus_property_append_uint64, "t", &m->finish_timestamp.realtime }, - { "org.freedesktop.systemd1.Manager", "LogLevel", bus_manager_append_log_level, "s", NULL }, - { "org.freedesktop.systemd1.Manager", "LogTarget", bus_manager_append_log_target, "s", NULL }, + { "org.freedesktop.systemd1.Manager", "LogLevel", bus_manager_append_log_level, "s", NULL, bus_manager_set_log_level}, + { "org.freedesktop.systemd1.Manager", "LogTarget", bus_manager_append_log_target, "s", NULL, bus_manager_set_log_target}, { "org.freedesktop.systemd1.Manager", "NNames", bus_manager_append_n_names, "u", NULL }, { "org.freedesktop.systemd1.Manager", "NJobs", bus_manager_append_n_jobs, "u", NULL }, { "org.freedesktop.systemd1.Manager", "NInstalledJobs",bus_property_append_uint32, "u", &m->n_installed_jobs }, diff --git a/src/dbus.c b/src/dbus.c index 965a3e2f21..5a4750d6b9 100644 --- a/src/dbus.c +++ b/src/dbus.c @@ -1316,6 +1316,58 @@ DBusHandlerResult bus_default_message_handler(Manager *m, DBusConnection *c, DBu if (!dbus_message_iter_close_container(&iter, &sub)) goto oom; + } else if (dbus_message_is_method_call(message, "org.freedesktop.DBus.Properties", "Set") && properties) { + const char *interface, *property; + DBusMessageIter iter; + const BusProperty *p; + + if (!dbus_message_iter_init(message, &iter) || + dbus_message_iter_get_arg_type(&iter) != DBUS_TYPE_STRING) + return bus_send_error_reply(m, c, message, NULL, -EINVAL); + + dbus_message_iter_get_basic(&iter, &interface); + + if (!dbus_message_iter_next(&iter) || + dbus_message_iter_get_arg_type(&iter) != DBUS_TYPE_STRING) + return bus_send_error_reply(m, c, message, NULL, -EINVAL); + + dbus_message_iter_get_basic(&iter, &property); + + if (!dbus_message_iter_next(&iter) || + dbus_message_iter_get_arg_type(&iter) != DBUS_TYPE_VARIANT || + dbus_message_iter_has_next(&iter)) + return bus_send_error_reply(m, c, message, NULL, -EINVAL); + + for (p = properties; p->property; p++) + if (streq(p->interface, interface) && streq(p->property, property)) + break; + + if (p->set) { + DBusMessageIter sub; + char *sig; + + dbus_message_iter_recurse(&iter, &sub); + + if (!(sig = dbus_message_iter_get_signature(&sub))) + goto oom; + + if (!streq(sig, p->signature)) { + dbus_free(sig); + return bus_send_error_reply(m, c, message, NULL, -EINVAL); + } + + dbus_free(sig); + + if ((r = p->set(m, &sub, property)) < 0) { + if (r == -ENOMEM) + goto oom; + return bus_send_error_reply(m, c, message, NULL, r); + } + + if (!(reply = dbus_message_new_method_return(message))) + goto oom; + } else + return bus_send_error_reply(m, c, message, NULL, -EINVAL); } if (reply) { diff --git a/src/dbus.h b/src/dbus.h index d0a9e8e30f..255b653376 100644 --- a/src/dbus.h +++ b/src/dbus.h @@ -27,6 +27,7 @@ #include "manager.h" typedef int (*BusPropertyCallback)(Manager *m, DBusMessageIter *iter, const char *property, void *data); +typedef int (*BusPropertySetCallback)(Manager *m, DBusMessageIter *iter, const char *property); typedef struct BusProperty { const char *interface; /* interface of the property */ @@ -34,6 +35,7 @@ typedef struct BusProperty { BusPropertyCallback append; /* Function that is called to serialize this property */ const char *signature; const void *data; /* The data of this property */ + BusPropertySetCallback set; /* Function that is called to set this property */ } BusProperty; #define BUS_PROPERTIES_INTERFACE \ @@ -47,6 +49,11 @@ typedef struct BusProperty { " \n" \ " \n" \ " \n" \ + " \n" \ + " \n" \ + " \n" \ + " \n" \ + " \n" \ " \n" \ " \n" \ " \n" \ -- cgit v1.2.3-54-g00ecf