[systemd-commits] 2 commits - Makefile.am src/hostname src/libsystemd-bus src/locale src/timedate
Kay Sievers
kay at kemper.freedesktop.org
Sat Nov 2 02:19:28 CET 2013
Makefile.am | 5
src/hostname/hostnamectl.c | 356 +++++++++++-------------------------------
src/libsystemd-bus/bus-util.c | 165 +++++++++++++++++++
src/libsystemd-bus/bus-util.h | 11 +
src/locale/localectl.c | 129 ++-------------
src/timedate/timedatectl.c | 112 ++-----------
6 files changed, 311 insertions(+), 467 deletions(-)
New commits:
commit b028f3e410a7b9ba6b6291a79164d3de2638eb0b
Author: Simon Peeters <peeters.simon at gmail.com>
Date: Wed Oct 30 06:55:31 2013 +0100
hostnamectl: port to sd-bus
Kay:
- rebase to new transport logic
- replaced iteration macro with property map
diff --git a/Makefile.am b/Makefile.am
index 8e99673..e9b80bf 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3523,12 +3523,11 @@ hostnamectl_SOURCES = \
src/hostname/hostnamectl.c
hostnamectl_CFLAGS = \
- $(AM_CFLAGS) \
- $(DBUS_CFLAGS)
+ $(AM_CFLAGS)
hostnamectl_LDADD = \
libsystemd-shared.la \
- libsystemd-dbus.la \
+ libsystemd-bus.la \
libsystemd-id128-internal.la
bin_PROGRAMS += \
diff --git a/src/hostname/hostnamectl.c b/src/hostname/hostnamectl.c
index c6d72b5..7591d99 100644
--- a/src/hostname/hostnamectl.c
+++ b/src/hostname/hostnamectl.c
@@ -28,7 +28,10 @@
#include <sys/timex.h>
#include <sys/utsname.h>
-#include "dbus-common.h"
+#include "sd-bus.h"
+
+#include "bus-util.h"
+#include "bus-error.h"
#include "util.h"
#include "spawn-polkit-agent.h"
#include "build.h"
@@ -38,34 +41,19 @@
#include "virt.h"
#include "fileio.h"
-static enum transport {
- TRANSPORT_NORMAL,
- TRANSPORT_SSH,
- TRANSPORT_POLKIT
-} arg_transport = TRANSPORT_NORMAL;
static bool arg_ask_password = true;
+static BusTransport arg_transport = BUS_TRANSPORT_LOCAL;
static char *arg_host = NULL;
-static char *arg_user = NULL;
static bool arg_transient = false;
static bool arg_pretty = false;
static bool arg_static = false;
-static void polkit_agent_open_if_enabled(void) {
-
- /* Open the polkit agent as a child process if necessary */
-
- if (!arg_ask_password)
- return;
-
- polkit_agent_open();
-}
-
typedef struct StatusInfo {
- const char *hostname;
- const char *static_hostname;
- const char *pretty_hostname;
- const char *icon_name;
- const char *chassis;
+ char *hostname;
+ char *static_hostname;
+ char *pretty_hostname;
+ char *icon_name;
+ char *chassis;
} StatusInfo;
static void print_status_info(StatusInfo *i) {
@@ -125,139 +113,64 @@ static void print_status_info(StatusInfo *i) {
}
-static int status_property(const char *name, DBusMessageIter *iter, StatusInfo *i) {
- assert(name);
- assert(iter);
-
- switch (dbus_message_iter_get_arg_type(iter)) {
-
- case DBUS_TYPE_STRING: {
- const char *s;
-
- dbus_message_iter_get_basic(iter, &s);
- if (!isempty(s)) {
- if (streq(name, "Hostname"))
- i->hostname = s;
- if (streq(name, "StaticHostname"))
- i->static_hostname = s;
- if (streq(name, "PrettyHostname"))
- i->pretty_hostname = s;
- if (streq(name, "IconName"))
- i->icon_name = s;
- if (streq(name, "Chassis"))
- i->chassis = s;
- }
- break;
- }
- }
-
- return 0;
-}
-
-static int show_one_name(DBusConnection *bus, const char* attr) {
- _cleanup_dbus_message_unref_ DBusMessage *reply = NULL;
- const char *interface = "org.freedesktop.hostname1", *s;
- DBusMessageIter iter, sub;
+static int show_one_name(sd_bus *bus, const char* attr) {
+ _cleanup_bus_message_unref_ sd_bus_message *reply = NULL;
+ _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL;
+ const char *s;
int r;
- r = bus_method_call_with_reply(
+ r = sd_bus_get_property(
bus,
"org.freedesktop.hostname1",
"/org/freedesktop/hostname1",
- "org.freedesktop.DBus.Properties",
- "Get",
- &reply,
- NULL,
- DBUS_TYPE_STRING, &interface,
- DBUS_TYPE_STRING, &attr,
- DBUS_TYPE_INVALID);
- if (r < 0)
+ "org.freedesktop.hostname1",
+ attr,
+ &error, &reply, "s");
+ if (r < 0) {
+ log_error("Could not get property: %s", bus_error_message(&error, -r));
return r;
-
- if (!dbus_message_iter_init(reply, &iter) ||
- dbus_message_iter_get_arg_type(&iter) != DBUS_TYPE_VARIANT) {
- log_error("Failed to parse reply.");
- return -EIO;
}
- dbus_message_iter_recurse(&iter, &sub);
-
- if (dbus_message_iter_get_arg_type(&sub) != DBUS_TYPE_STRING) {
- log_error("Failed to parse reply.");
- return -EIO;
- }
+ r = sd_bus_message_read(reply, "s", &s);
+ if (r < 0)
+ return r;
- dbus_message_iter_get_basic(&sub, &s);
printf("%s\n", s);
return 0;
}
-static int show_all_names(DBusConnection *bus) {
- _cleanup_dbus_message_unref_ DBusMessage *reply = NULL;
- const char *interface = "";
- int r;
- DBusMessageIter iter, sub, sub2, sub3;
+static int show_all_names(sd_bus *bus) {
StatusInfo info = {};
+ const struct bus_properties_map map[] = {
+ { "s", "Hostname", &info.hostname },
+ { "s", "StaticHostname", &info.static_hostname },
+ { "s", "PrettyHostname", &info.pretty_hostname },
+ { "s", "IconName", &info.icon_name },
+ { "s", "Chassis", &info.chassis },
+ {}
+ };
+ int r;
- r = bus_method_call_with_reply(
- bus,
- "org.freedesktop.hostname1",
- "/org/freedesktop/hostname1",
- "org.freedesktop.DBus.Properties",
- "GetAll",
- &reply,
- NULL,
- DBUS_TYPE_STRING, &interface,
- DBUS_TYPE_INVALID);
+ r = bus_map_all_properties(bus,
+ "org.freedesktop.hostname1",
+ "/org/freedesktop/hostname1",
+ map);
if (r < 0)
- return r;
-
- if (!dbus_message_iter_init(reply, &iter) ||
- dbus_message_iter_get_arg_type(&iter) != DBUS_TYPE_ARRAY ||
- dbus_message_iter_get_element_type(&iter) != DBUS_TYPE_DICT_ENTRY) {
- log_error("Failed to parse reply.");
- return -EIO;
- }
-
- dbus_message_iter_recurse(&iter, &sub);
-
- while (dbus_message_iter_get_arg_type(&sub) != DBUS_TYPE_INVALID) {
- const char *name;
-
- if (dbus_message_iter_get_arg_type(&sub) != DBUS_TYPE_DICT_ENTRY) {
- log_error("Failed to parse reply.");
- return -EIO;
- }
-
- dbus_message_iter_recurse(&sub, &sub2);
-
- if (bus_iter_get_basic_and_next(&sub2, DBUS_TYPE_STRING, &name, true) < 0) {
- log_error("Failed to parse reply.");
- return -EIO;
- }
-
- if (dbus_message_iter_get_arg_type(&sub2) != DBUS_TYPE_VARIANT) {
- log_error("Failed to parse reply.");
- return -EIO;
- }
-
- dbus_message_iter_recurse(&sub2, &sub3);
-
- r = status_property(name, &sub3, &info);
- if (r < 0) {
- log_error("Failed to parse reply.");
- return r;
- }
-
- dbus_message_iter_next(&sub);
- }
+ goto fail;
print_status_info(&info);
+
+fail:
+ free(info.hostname);
+ free(info.static_hostname);
+ free(info.pretty_hostname);
+ free(info.icon_name);
+ free(info.chassis);
return 0;
}
-static int show_status(DBusConnection *bus, char **args, unsigned n) {
+static int show_status(sd_bus *bus, char **args, unsigned n) {
assert(args);
if (arg_pretty || arg_static || arg_transient) {
@@ -276,9 +189,29 @@ static int show_status(DBusConnection *bus, char **args, unsigned n) {
return show_all_names(bus);
}
-static int set_hostname(DBusConnection *bus, char **args, unsigned n) {
- _cleanup_dbus_message_unref_ DBusMessage *reply = NULL;
- dbus_bool_t interactive = arg_ask_password;
+static int set_simple_string(sd_bus *bus, const char *method, const char *value) {
+ _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL;
+ static bool first=true;
+ int r = 0;
+
+ if (first && arg_ask_password)
+ polkit_agent_open();
+ first = false;
+
+ r = sd_bus_call_method(
+ bus,
+ "org.freedesktop.hostname1",
+ "/org/freedesktop/hostname1",
+ "org.freedesktop.hostname1",
+ method,
+ &error, NULL,
+ "sb", value, arg_ask_password);
+ if (r < 0)
+ log_error("Could not set property: %s", bus_error_message(&error, -r));
+ return r;
+}
+
+static int set_hostname(sd_bus *bus, char **args, unsigned n) {
_cleanup_free_ char *h = NULL;
const char *hostname = args[1];
int r;
@@ -286,8 +219,6 @@ static int set_hostname(DBusConnection *bus, char **args, unsigned n) {
assert(args);
assert(n == 2);
- polkit_agent_open_if_enabled();
-
if (!arg_pretty && !arg_static && !arg_transient)
arg_pretty = arg_static = arg_transient = true;
@@ -313,57 +244,19 @@ static int set_hostname(DBusConnection *bus, char **args, unsigned n) {
hostname = h;
}
- r = bus_method_call_with_reply(
- bus,
- "org.freedesktop.hostname1",
- "/org/freedesktop/hostname1",
- "org.freedesktop.hostname1",
- "SetPrettyHostname",
- &reply,
- NULL,
- DBUS_TYPE_STRING, &p,
- DBUS_TYPE_BOOLEAN, &interactive,
- DBUS_TYPE_INVALID);
+ r = set_simple_string(bus, "SetPrettyHostname", p);
if (r < 0)
return r;
-
- dbus_message_unref(reply);
- reply = NULL;
}
if (arg_static) {
- r = bus_method_call_with_reply(
- bus,
- "org.freedesktop.hostname1",
- "/org/freedesktop/hostname1",
- "org.freedesktop.hostname1",
- "SetStaticHostname",
- &reply,
- NULL,
- DBUS_TYPE_STRING, &hostname,
- DBUS_TYPE_BOOLEAN, &interactive,
- DBUS_TYPE_INVALID);
-
+ r = set_simple_string(bus, "SetStaticHostname", hostname);
if (r < 0)
return r;
-
- dbus_message_unref(reply);
- reply = NULL;
}
if (arg_transient) {
- r = bus_method_call_with_reply(
- bus,
- "org.freedesktop.hostname1",
- "/org/freedesktop/hostname1",
- "org.freedesktop.hostname1",
- "SetHostname",
- &reply,
- NULL,
- DBUS_TYPE_STRING, &hostname,
- DBUS_TYPE_BOOLEAN, &interactive,
- DBUS_TYPE_INVALID);
-
+ r = set_simple_string(bus, "SetHostname", hostname);
if (r < 0)
return r;
}
@@ -371,48 +264,18 @@ static int set_hostname(DBusConnection *bus, char **args, unsigned n) {
return 0;
}
-static int set_icon_name(DBusConnection *bus, char **args, unsigned n) {
- _cleanup_dbus_message_unref_ DBusMessage *reply = NULL;
- dbus_bool_t interactive = arg_ask_password;
-
+static int set_icon_name(sd_bus *bus, char **args, unsigned n) {
assert(args);
assert(n == 2);
- polkit_agent_open_if_enabled();
-
- return bus_method_call_with_reply(
- bus,
- "org.freedesktop.hostname1",
- "/org/freedesktop/hostname1",
- "org.freedesktop.hostname1",
- "SetIconName",
- &reply,
- NULL,
- DBUS_TYPE_STRING, &args[1],
- DBUS_TYPE_BOOLEAN, &interactive,
- DBUS_TYPE_INVALID);
+ return set_simple_string(bus, "SetIconName", args[1]);
}
-static int set_chassis(DBusConnection *bus, char **args, unsigned n) {
- _cleanup_dbus_message_unref_ DBusMessage *reply = NULL;
- dbus_bool_t interactive = arg_ask_password;
-
+static int set_chassis(sd_bus *bus, char **args, unsigned n) {
assert(args);
assert(n == 2);
- polkit_agent_open_if_enabled();
-
- return bus_method_call_with_reply(
- bus,
- "org.freedesktop.hostname1",
- "/org/freedesktop/hostname1",
- "org.freedesktop.hostname1",
- "SetChassis",
- &reply,
- NULL,
- DBUS_TYPE_STRING, &args[1],
- DBUS_TYPE_BOOLEAN, &interactive,
- DBUS_TYPE_INVALID);
+ return set_simple_string(bus, "SetChasis", args[1]);
}
static int help(void) {
@@ -424,9 +287,9 @@ static int help(void) {
" --transient Only set transient hostname\n"
" --static Only set static hostname\n"
" --pretty Only set pretty hostname\n"
- " -P --privileged Acquire privileges before execution\n"
" --no-ask-password Do not prompt for password\n"
- " -H --host=[USER@]HOST Operate on remote host\n\n"
+ " -H --host=[USER@]HOST Operate on remote host\n"
+ " -M --machine=CONTAINER Operate on local container\n\n"
"Commands:\n"
" status Show current hostname settings\n"
" set-hostname NAME Set system hostname\n"
@@ -454,7 +317,7 @@ static int parse_argv(int argc, char *argv[]) {
{ "static", no_argument, NULL, ARG_STATIC },
{ "pretty", no_argument, NULL, ARG_PRETTY },
{ "host", required_argument, NULL, 'H' },
- { "privileged", no_argument, NULL, 'P' },
+ { "machine", required_argument, NULL, 'M' },
{ "no-ask-password", no_argument, NULL, ARG_NO_ASK_PASSWORD },
{ NULL, 0, NULL, 0 }
};
@@ -464,7 +327,7 @@ static int parse_argv(int argc, char *argv[]) {
assert(argc >= 0);
assert(argv);
- while ((c = getopt_long(argc, argv, "hH:P", options, NULL)) >= 0) {
+ while ((c = getopt_long(argc, argv, "hHM:P", options, NULL)) >= 0) {
switch (c) {
@@ -477,13 +340,14 @@ static int parse_argv(int argc, char *argv[]) {
puts(SYSTEMD_FEATURES);
return 0;
- case 'P':
- arg_transport = TRANSPORT_POLKIT;
+ case 'H':
+ arg_transport = BUS_TRANSPORT_REMOTE;
+ arg_host = optarg;
break;
- case 'H':
- arg_transport = TRANSPORT_SSH;
- parse_user_at_host(optarg, &arg_user, &arg_host);
+ case 'M':
+ arg_transport = BUS_TRANSPORT_CONTAINER;
+ arg_host = optarg;
break;
case ARG_TRANSIENT:
@@ -514,7 +378,7 @@ static int parse_argv(int argc, char *argv[]) {
return 1;
}
-static int hostnamectl_main(DBusConnection *bus, int argc, char *argv[], DBusError *error) {
+static int hostnamectl_main(sd_bus *bus, int argc, char *argv[]) {
static const struct {
const char* verb;
@@ -524,7 +388,7 @@ static int hostnamectl_main(DBusConnection *bus, int argc, char *argv[], DBusErr
EQUAL
} argc_cmp;
const int argc;
- int (* const dispatch)(DBusConnection *bus, char **args, unsigned n);
+ int (* const dispatch)(sd_bus *bus, char **args, unsigned n);
} verbs[] = {
{ "status", LESS, 1, show_status },
{ "set-hostname", EQUAL, 2, set_hostname },
@@ -537,7 +401,6 @@ static int hostnamectl_main(DBusConnection *bus, int argc, char *argv[], DBusErr
assert(argc >= 0);
assert(argv);
- assert(error);
left = argc - optind;
@@ -590,54 +453,29 @@ static int hostnamectl_main(DBusConnection *bus, int argc, char *argv[], DBusErr
assert_not_reached("Unknown comparison operator.");
}
- if (!bus) {
- log_error("Failed to get D-Bus connection: %s", error->message);
- return -EIO;
- }
-
return verbs[i].dispatch(bus, argv + optind, left);
}
int main(int argc, char *argv[]) {
- int r, retval = EXIT_FAILURE;
- DBusConnection *bus = NULL;
- DBusError error;
-
- dbus_error_init(&error);
+ int r;
+ _cleanup_bus_unref_ sd_bus *bus = NULL;
setlocale(LC_ALL, "");
log_parse_environment();
log_open();
r = parse_argv(argc, argv);
- if (r < 0)
+ if (r <= 0)
goto finish;
- else if (r == 0) {
- retval = EXIT_SUCCESS;
+
+ r = bus_open_transport(arg_transport, arg_host, false, &bus);
+ if (r < 0) {
+ log_error("Failed to create bus connection: %s", strerror(-r));
goto finish;
}
- if (arg_transport == TRANSPORT_NORMAL)
- bus = dbus_bus_get_private(DBUS_BUS_SYSTEM, &error);
- else if (arg_transport == TRANSPORT_POLKIT)
- bus_connect_system_polkit(&bus, &error);
- else if (arg_transport == TRANSPORT_SSH)
- bus_connect_system_ssh(NULL, arg_host, &bus, &error);
- else
- assert_not_reached("Uh, invalid transport...");
-
- r = hostnamectl_main(bus, argc, argv, &error);
- retval = r < 0 ? EXIT_FAILURE : r;
+ r = hostnamectl_main(bus, argc, argv);
finish:
- if (bus) {
- dbus_connection_flush(bus);
- dbus_connection_close(bus);
- dbus_connection_unref(bus);
- }
-
- dbus_error_free(&error);
- dbus_shutdown();
-
- return retval;
+ return r < 0 ? EXIT_FAILURE : r;
}
commit ffc06c3513d9a0693c7f810d03b20705127ba55a
Author: Kay Sievers <kay at vrfy.org>
Date: Sat Nov 2 00:10:12 2013 +0100
bus: use internal helper to read org.freedesktop.DBus.Properties::GetAll variables
diff --git a/src/libsystemd-bus/bus-util.c b/src/libsystemd-bus/bus-util.c
index 0632288..857e0c1 100644
--- a/src/libsystemd-bus/bus-util.c
+++ b/src/libsystemd-bus/bus-util.c
@@ -21,13 +21,16 @@
#include <sys/socket.h>
-#include "sd-event.h"
-#include "sd-bus.h"
-
#include "util.h"
+#include "strv.h"
#include "macro.h"
#include "def.h"
+#include "sd-event.h"
+#include "sd-bus.h"
+#include "bus-error.h"
+#include "bus-message.h"
+
#include "bus-util.h"
static int quit_callback(sd_bus *bus, sd_bus_message *m, void *userdata) {
@@ -595,6 +598,162 @@ int bus_generic_print_property(const char *name, sd_bus_message *property, bool
return 0;
}
+int bus_map_all_properties(sd_bus *bus,
+ const char *destination,
+ const char *path,
+ const struct bus_properties_map *map) {
+ _cleanup_bus_message_unref_ sd_bus_message *m = NULL;
+ _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL;
+ int r;
+
+ r = sd_bus_call_method( bus,
+ destination,
+ path,
+ "org.freedesktop.DBus.Properties",
+ "GetAll",
+ &error,
+ &m,
+ "s", "");
+ if (r < 0) {
+ log_error("Could not get properties: %s", bus_error_message(&error, -r));
+ return r;
+ }
+
+ r = sd_bus_message_enter_container(m, SD_BUS_TYPE_ARRAY, "{sv}");
+ if (r < 0)
+ return r;
+
+ while ((r = sd_bus_message_enter_container(m, SD_BUS_TYPE_DICT_ENTRY, "sv")) > 0) {
+ const char *name;
+ char type;
+ const char *contents;
+ unsigned i;
+
+ r = sd_bus_message_read_basic(m, SD_BUS_TYPE_STRING, &name);
+ if (r < 0)
+ return r;
+
+ r = sd_bus_message_peek_type(m, NULL, &contents);
+ if (r < 0)
+ return r;
+
+ r = sd_bus_message_enter_container(m, SD_BUS_TYPE_VARIANT, contents);
+ if (r < 0)
+ return r;
+
+ r = sd_bus_message_peek_type(m, &type, &contents);
+ if (r < 0) {
+ log_error("Could not determine type of message: %s", strerror(-r));
+ return r;
+ }
+
+ switch (type) {
+ case SD_BUS_TYPE_STRING: {
+ const char *s;
+
+ sd_bus_message_read_basic(m, type, &s);
+ if (isempty(s))
+ break;
+
+ for (i = 0; map[i].type; i++) {
+ const char **p;
+
+ if (!streq(map[i].type, "s"))
+ continue;
+ if (!streq(map[i].name, name))
+ continue;
+
+ p = map[i].ptr;
+ *p = strdup(s);
+ if (!*p) {
+ r = -ENOMEM;
+ goto fail;
+ }
+ }
+ break;
+ }
+
+ case SD_BUS_TYPE_ARRAY: {
+ _cleanup_strv_free_ char **l = NULL;
+
+ if (!streq(contents, "s"))
+ break;
+
+ for (i = 0; map[i].type; i++) {
+ char ***p;
+
+ if (!streq(map[i].type, "as"))
+ continue;
+ if (!streq(map[i].name, name))
+ continue;
+
+ r = bus_message_read_strv_extend(m, &l);
+ if (r < 0)
+ break;
+
+ p = map[i].ptr;
+ strv_free(*p);
+ *p = l;
+ l = NULL;
+ }
+ break;
+ }
+
+ case SD_BUS_TYPE_BOOLEAN: {
+ unsigned b;
+
+ sd_bus_message_read_basic(m, type, &b);
+
+ for (i = 0; map[i].type; i++) {
+ bool *p;
+
+ if (!streq(map[i].type, "b"))
+ continue;
+ if (!streq(map[i].name, name))
+ continue;
+
+ p = map[i].ptr;
+ *p = b;
+ }
+ break;
+ }
+
+ case SD_BUS_TYPE_UINT64: {
+ uint64_t t;
+
+ sd_bus_message_read_basic(m, type, &t);
+
+ for (i = 0; map[i].type; i++) {
+ uint64_t *p;
+
+ if (!streq(map[i].type, "t"))
+ continue;
+ if (!streq(map[i].name, name))
+ continue;
+
+ p = map[i].ptr;
+ *p = t;
+ }
+ break;
+ }
+
+ default:
+ break;
+ }
+
+ r = sd_bus_message_exit_container(m);
+ if (r < 0)
+ return r;
+
+ r = sd_bus_message_exit_container(m);
+ if (r < 0)
+ return r;
+ }
+
+fail:
+ return r;
+}
+
int bus_open_transport(BusTransport transport, const char *host, bool user, sd_bus **bus) {
int r;
diff --git a/src/libsystemd-bus/bus-util.h b/src/libsystemd-bus/bus-util.h
index e70006e..ddb9264 100644
--- a/src/libsystemd-bus/bus-util.h
+++ b/src/libsystemd-bus/bus-util.h
@@ -35,6 +35,17 @@ typedef enum BusTransport {
_BUS_TRANSPORT_INVALID = -1
} BusTransport;
+struct bus_properties_map {
+ const char *type;
+ const char *name;
+ void *ptr;
+};
+
+int bus_map_all_properties(sd_bus *bus,
+ const char *destination,
+ const char *path,
+ const struct bus_properties_map *map);
+
int bus_async_unregister_and_quit(sd_event *e, sd_bus *bus, const char *name);
int bus_event_loop_with_idle(sd_event *e, sd_bus *bus, const char *name, usec_t timeout);
diff --git a/src/locale/localectl.c b/src/locale/localectl.c
index fe2af27..fb21bfd 100644
--- a/src/locale/localectl.c
+++ b/src/locale/localectl.c
@@ -102,125 +102,30 @@ static void print_status_info(StatusInfo *i) {
printf(" X11 Options: %s\n", i->x11_options);
}
-static int status_read_property(const char *name, sd_bus_message *property, StatusInfo *i) {
- char type;
- const char *contents;
- int r;
-
- assert(name);
- assert(property);
-
- r = sd_bus_message_peek_type(property, &type, &contents);
- if (r < 0) {
- log_error("Could not determine type of message: %s", strerror(-r));
- return r;
- }
-
- switch (type) {
-
- case SD_BUS_TYPE_STRING: {
- const char *s;
-
- sd_bus_message_read_basic(property, type, &s);
- if (isempty(s))
- break;
-
- if (streq(name, "VConsoleKeymap"))
- i->vconsole_keymap = s;
- else if (streq(name, "VConsoleKeymapToggle"))
- i->vconsole_keymap_toggle = s;
- else if (streq(name, "X11Layout"))
- i->x11_layout = s;
- else if (streq(name, "X11Model"))
- i->x11_model = s;
- else if (streq(name, "X11Variant"))
- i->x11_variant = s;
- else if (streq(name, "X11Options"))
- i->x11_options = s;
-
- break;
- }
-
- case SD_BUS_TYPE_ARRAY: {
- _cleanup_strv_free_ char **l = NULL;
-
- if (!streq(contents, "s"))
- break;
-
- if (!streq(name, "Locale"))
- break;
-
- r = bus_message_read_strv_extend(property, &l);
- if (r < 0)
- break;
-
- strv_free(i->locale);
- i->locale = l;
- l = NULL;
-
- break;
- }
- }
-
- return r;
-}
-
static int show_status(sd_bus *bus, char **args, unsigned n) {
- _cleanup_bus_message_unref_ sd_bus_message *reply = NULL;
- _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL;
- int r;
StatusInfo info = {};
+ const struct bus_properties_map map[] = {
+ { "s", "VConsoleKeymap", &info.vconsole_keymap },
+ { "s", "VConsoleKeymap", &info.vconsole_keymap },
+ { "s", "VConsoleKeymapToggle", &info.vconsole_keymap_toggle},
+ { "s", "X11Layout", &info.x11_layout },
+ { "s", "X11Model", &info.x11_model },
+ { "s", "X11Variant", &info.x11_variant },
+ { "s", "X11Options", &info.x11_options },
+ { "as", "Locale", &info.locale },
+ {}
+ };
+ int r;
- assert(args);
-
- r = sd_bus_call_method( bus,
- "org.freedesktop.locale1",
- "/org/freedesktop/locale1",
- "org.freedesktop.DBus.Properties",
- "GetAll",
- &error,
- &reply,
- "s", "");
- if (r < 0) {
- log_error("Could not get properties: %s", bus_error_message(&error, -r));
- return r;
- }
+ assert(bus);
- r = sd_bus_message_enter_container(reply, SD_BUS_TYPE_ARRAY, "{sv}");
+ r = bus_map_all_properties(bus,
+ "org.freedesktop.locale1",
+ "/org/freedesktop/locale1",
+ map);
if (r < 0)
goto fail;
- while ((r = sd_bus_message_enter_container(reply, SD_BUS_TYPE_DICT_ENTRY, "sv")) > 0) {
- const char *name;
- const char *contents;
-
- r = sd_bus_message_read_basic(reply, SD_BUS_TYPE_STRING, &name);
- if (r < 0)
- goto fail;
-
- r = sd_bus_message_peek_type(reply, NULL, &contents);
- if (r < 0)
- goto fail;
-
- r = sd_bus_message_enter_container(reply, SD_BUS_TYPE_VARIANT, contents);
- if (r < 0)
- goto fail;
-
- r = status_read_property(name, reply, &info);
- if (r < 0) {
- log_error("Failed to parse reply.");
- return r;
- }
-
- r = sd_bus_message_exit_container(reply);
- if (r < 0)
- goto fail;
-
- r = sd_bus_message_exit_container(reply);
- if (r < 0)
- goto fail;
- }
-
print_status_info(&info);
fail:
diff --git a/src/timedate/timedatectl.c b/src/timedate/timedatectl.c
index b63f1f5..777a3a3 100644
--- a/src/timedate/timedatectl.c
+++ b/src/timedate/timedatectl.c
@@ -63,7 +63,7 @@ static void polkit_agent_open_if_enabled(void) {
typedef struct StatusInfo {
usec_t time;
- const char *timezone;
+ char *timezone;
usec_t rtc_time;
bool rtc_local;
@@ -89,7 +89,7 @@ static const char *jump_str(int delta_minutes, char *s, size_t size) {
return "";
}
-static void print_status_info(StatusInfo *i) {
+static void print_status_info(const StatusInfo *i) {
char a[FORMAT_TIMESTAMP_MAX];
char b[FORMAT_TIMESTAMP_MAX];
char s[32];
@@ -190,103 +190,35 @@ static void print_status_info(StatusInfo *i) {
" RTC in UTC, by calling 'timedatectl set-local-rtc 0'" ANSI_HIGHLIGHT_OFF ".\n", stdout);
}
-static int get_timedate_property_bool(sd_bus *bus, const char *name, bool *target) {
- _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL;
- int r, b;
-
- assert(name);
-
- r = sd_bus_get_property_trivial(
- bus,
- "org.freedesktop.timedate1",
- "/org/freedesktop/timedate1",
- "org.freedesktop.timedate1",
- name,
- &error,
- 'b', &b);
- if (r < 0) {
- log_error("Failed to get property: %s %s", name, bus_error_message(&error, -r));
- return r;
- }
-
- *target = b;
- return 0;
-}
-
-static int get_timedate_property_usec(sd_bus *bus, const char *name, usec_t *target) {
- _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL;
- int r;
-
- assert(name);
-
- r = sd_bus_get_property_trivial(
- bus,
- "org.freedesktop.timedate1",
- "/org/freedesktop/timedate1",
- "org.freedesktop.timedate1",
- name,
- &error,
- 't', target);
- if (r < 0) {
- log_error("Failed to get property: %s %s", name, bus_error_message(&error, -r));
- return r;
- }
-
- return 0;
-}
-
static int show_status(sd_bus *bus, char **args, unsigned n) {
- _cleanup_bus_message_unref_ sd_bus_message *reply = NULL;
_cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL;
- int r;
StatusInfo info = {};
+ const struct bus_properties_map map[] = {
+ { "s", "Timezone", &info.timezone },
+ { "b", "LocalRTC", &info.rtc_local },
+ { "b", "NTP", &info.ntp_enabled },
+ { "b", "CanNTP", &info.ntp_capable },
+ { "b", "NTPSynchronized", &info.ntp_synced},
+ { "t", "TimeUSec", &info.time },
+ { "t", "RTCTimeUSec", &info.rtc_time },
+ {}
+ };
+ int r;
assert(bus);
- r = sd_bus_get_property(
- bus,
- "org.freedesktop.timedate1",
- "/org/freedesktop/timedate1",
- "org.freedesktop.timedate1",
- "Timezone",
- &error,
- &reply,
- "s");
- if (r < 0) {
- log_error("Failed to get property: Timezone %s", bus_error_message(&error, -r));
- return r;
- }
-
- r = sd_bus_message_read(reply, "s", &info.timezone);
+ r = bus_map_all_properties(bus,
+ "org.freedesktop.timedate1",
+ "/org/freedesktop/timedate1",
+ map);
if (r < 0)
- return r;
-
- r = get_timedate_property_bool(bus, "LocalRTC", &info.rtc_local);
- if (r < 0)
- return r;
-
- r = get_timedate_property_bool(bus, "NTP", &info.ntp_enabled);
- if (r < 0)
- return r;
-
- r = get_timedate_property_bool(bus, "CanNTP", &info.ntp_capable);
- if (r < 0)
- return r;
-
- r = get_timedate_property_bool(bus, "NTPSynchronized", &info.ntp_synced);
- if (r < 0)
- return r;
-
- r = get_timedate_property_usec(bus, "TimeUSec", &info.time);
- if (r < 0)
- return r;
-
- r = get_timedate_property_usec(bus, "RTCTimeUSec", &info.rtc_time);
- if (r < 0)
- return r;
+ goto fail;
print_status_info(&info);
- return 0;
+
+fail:
+ free(info.timezone);
+ return r;
}
static int set_time(sd_bus *bus, char **args, unsigned n) {
More information about the systemd-commits
mailing list