From: Simon Peeters Date: Wed, 30 Oct 2013 05:55:31 +0000 (+0100) Subject: hostnamectl: port to sd-bus X-Git-Tag: v209~1678 X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=b028f3e410a7b9ba6b6291a79164d3de2638eb0b 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 8e996735f..e9b80bf11 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 c6d72b541..7591d9998 100644 --- a/src/hostname/hostnamectl.c +++ b/src/hostname/hostnamectl.c @@ -28,7 +28,10 @@ #include #include -#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; }