[systemd-devel] [PATCH 2/2] hostnamectl: port to sd-bus
Simon Peeters
peeters.simon at gmail.com
Wed Oct 30 06:55:31 CET 2013
---
Makefile.am | 5 +-
src/hostname/hostnamectl.c | 335 ++++++++++++------------------------------
src/libsystemd-bus/bus-util.h | 40 +++++
src/shared/macro.h | 3 +
4 files changed, 142 insertions(+), 241 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 8d1e85d..088689d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3515,12 +3515,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..a087ac7 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"
@@ -50,16 +53,6 @@ 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;
@@ -125,139 +118,77 @@ 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;
- StatusInfo info = {};
+static int show_all_names(sd_bus *bus) {
+ _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL;
+ _cleanup_bus_message_unref_ sd_bus_message *reply = NULL;
+ StatusInfo i = {};
+ const char *name, *contents;
+ int r = 0;
- r = bus_method_call_with_reply(
+ foreach_dbus_property(r,
bus,
"org.freedesktop.hostname1",
"/org/freedesktop/hostname1",
- "org.freedesktop.DBus.Properties",
- "GetAll",
- &reply,
- NULL,
- DBUS_TYPE_STRING, &interface,
- DBUS_TYPE_INVALID);
- 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;
+ error, reply,
+ name, contents) {
+ if (contents[0] == 's') {
+ const char *s;
+
+ r = sd_bus_message_read(reply, "s", &s);
+ if (r < 0) {
+ log_error("Failed to parse reply: %s", strerror(-r));
+ return -EIO;
+ }
+ 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;
+
+ }
}
-
- dbus_message_iter_next(&sub);
}
+ if (r < 0)
+ return r;
- print_status_info(&info);
+ print_status_info(&i);
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 +207,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 +237,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 +262,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 +282,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) {
@@ -477,15 +358,15 @@ static int parse_argv(int argc, char *argv[]) {
puts(SYSTEMD_FEATURES);
return 0;
- case 'P':
- arg_transport = TRANSPORT_POLKIT;
- break;
-
case 'H':
arg_transport = TRANSPORT_SSH;
parse_user_at_host(optarg, &arg_user, &arg_host);
break;
+ case 'P':
+ arg_transport = TRANSPORT_POLKIT;
+ break;
+
case ARG_TRANSIENT:
arg_transient = true;
break;
@@ -514,7 +395,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 +405,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 +418,6 @@ static int hostnamectl_main(DBusConnection *bus, int argc, char *argv[], DBusErr
assert(argc >= 0);
assert(argv);
- assert(error);
left = argc - optind;
@@ -590,54 +470,33 @@ 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;
- goto finish;
- }
if (arg_transport == TRANSPORT_NORMAL)
- bus = dbus_bus_get_private(DBUS_BUS_SYSTEM, &error);
+ r = sd_bus_open_system(&bus);
else if (arg_transport == TRANSPORT_POLKIT)
- bus_connect_system_polkit(&bus, &error);
+ r = bus_connect_system_polkit(&bus);
else if (arg_transport == TRANSPORT_SSH)
- bus_connect_system_ssh(NULL, arg_host, &bus, &error);
+ r = bus_connect_system_ssh(arg_host, &bus);
else
assert_not_reached("Uh, invalid transport...");
+ if (r < 0)
+ return EXIT_FAILURE;
- 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;
}
diff --git a/src/libsystemd-bus/bus-util.h b/src/libsystemd-bus/bus-util.h
index 92df3c2..2cdb4d6 100644
--- a/src/libsystemd-bus/bus-util.h
+++ b/src/libsystemd-bus/bus-util.h
@@ -75,6 +75,46 @@ DEFINE_TRIVIAL_CLEANUP_FUNC(sd_bus_message*, sd_bus_message_unref);
} \
struct __useless_struct_to_allow_trailing_semicolon__
+#define foreach_dbus_property(r, bus, dest, object, error, reply, name, contents) \
+ for (int _i = 0; _i < 3; _i++) \
+ if (_i == 0) { \
+ r = sd_bus_call_method(bus, dest, object,\
+ "org.freedesktop.DBus.Properties",\
+ "GetAll", &error, &reply, "s", "");\
+ if (r < 0) {\
+ log_error("Could not get properties: %s", bus_error_message(&error, -r));\
+ break;\
+ }\
+ r = sd_bus_message_enter_container(reply, SD_BUS_TYPE_ARRAY, "{sv}");\
+ if (r < 0) goto CATENATE(fail,__LINE__); \
+ } else if (_i == 2) { \
+ r = sd_bus_message_exit_container(reply);\
+ if (r < 0) goto CATENATE(fail,__LINE__); \
+ break;\
+ CATENATE(fail,__LINE__):\
+ log_error("Failed to parse reply: %s", strerror(-r)); \
+ r = -EIO;\
+ break;\
+ } else \
+ while ((r = sd_bus_message_enter_container(reply,\
+ SD_BUS_TYPE_DICT_ENTRY, "sv")) > 0)\
+ for (int _j = 0; _j < 3; _j++) \
+ if (_j == 0) {\
+ if (r < 0) goto CATENATE(fail,__LINE__);\
+ r = sd_bus_message_read(reply, "s", &(name));\
+ if (r < 0) goto CATENATE(fail,__LINE__);\
+ r = sd_bus_message_peek_type(reply, NULL, &(contents));\
+ if (r < 0) goto CATENATE(fail,__LINE__);\
+ r = sd_bus_message_enter_container(reply,\
+ SD_BUS_TYPE_VARIANT, contents);\
+ if (r < 0) goto CATENATE(fail,__LINE__);\
+ } else if (_j ==2) {\
+ r = sd_bus_message_exit_container(reply);\
+ if (r < 0) goto CATENATE(fail,__LINE__);\
+ r = sd_bus_message_exit_container(reply);\
+ if (r < 0) goto CATENATE(fail,__LINE__);\
+ } else
+
#define BUS_ERROR_NO_SUCH_UNIT "org.freedesktop.systemd1.NoSuchUnit"
#define BUS_ERROR_LOAD_FAILED "org.freedesktop.systemd1.LoadFailed"
#define BUS_ERROR_JOB_FAILED "org.freedesktop.systemd1.JobFailed"
diff --git a/src/shared/macro.h b/src/shared/macro.h
index d3f4245..805c43c 100644
--- a/src/shared/macro.h
+++ b/src/shared/macro.h
@@ -53,6 +53,9 @@
#define XSTRINGIFY(x) #x
#define STRINGIFY(x) XSTRINGIFY(x)
+#define XCATENATE(a,b) a##b
+#define CATENATE(a,b) XCATENATE(a,b)
+
/* Rounds up */
#define ALIGN4(l) (((l) + 3) & ~3)
--
1.8.4.2
More information about the systemd-devel
mailing list