summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/libsystemd-bus/bus-util.c165
-rw-r--r--src/libsystemd-bus/bus-util.h11
-rw-r--r--src/locale/localectl.c129
-rw-r--r--src/timedate/timedatectl.c112
4 files changed, 212 insertions, 205 deletions
diff --git a/src/libsystemd-bus/bus-util.c b/src/libsystemd-bus/bus-util.c
index 0632288776..857e0c16ed 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 e70006e6eb..ddb926498f 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 fe2af27a24..fb21bfd7f7 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 b63f1f5ad3..777a3a32e3 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) {
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2024-07-09 21:24:03 +0000