diff --git a/src/network/networkctl-util.c b/src/network/networkctl-util.c index 6c1db351ae..590c8a6abc 100644 --- a/src/network/networkctl-util.c +++ b/src/network/networkctl-util.c @@ -3,16 +3,12 @@ #include #include -#include "sd-bus.h" - -#include "alloc-util.h" #include "ansi-color.h" #include "bus-util.h" #include "log.h" #include "networkctl.h" #include "networkctl-util.h" #include "polkit-agent.h" -#include "stdio-util.h" #include "string-util.h" #include "strv.h" #include "varlink-util.h" @@ -117,59 +113,6 @@ bool networkd_is_running(void) { return cached; } -int acquire_bus(sd_bus **ret) { - _cleanup_(sd_bus_flush_close_unrefp) sd_bus *bus = NULL; - int r; - - assert(ret); - - r = sd_bus_open_system(&bus); - if (r < 0) - return log_error_errno(r, "Failed to connect to system bus: %m"); - - (void) sd_bus_set_allow_interactive_authorization(bus, arg_ask_password); - - if (networkd_is_running()) { - r = varlink_connect_networkd(/* ret_varlink= */ NULL); - if (r < 0) - return r; - } else - log_warning("systemd-networkd is not running, output might be incomplete."); - - *ret = TAKE_PTR(bus); - return 0; -} - -int link_get_property( - sd_bus *bus, - int ifindex, - sd_bus_error *error, - sd_bus_message **reply, - const char *iface, - const char *propname, - const char *type) { - - _cleanup_free_ char *path = NULL; - char ifindex_str[DECIMAL_STR_MAX(int)]; - int r; - - assert(bus); - assert(ifindex >= 0); - assert(error); - assert(reply); - assert(iface); - assert(propname); - assert(type); - - xsprintf(ifindex_str, "%i", ifindex); - - r = sd_bus_path_encode("/org/freedesktop/network1/link", ifindex_str, &path); - if (r < 0) - return r; - - return sd_bus_get_property(bus, "org.freedesktop.network1", path, iface, propname, error, reply, type); -} - void operational_state_to_color(const char *name, const char *state, const char **on, const char **off) { if (STRPTR_IN_SET(state, "routable", "enslaved") || (streq_ptr(name, "lo") && streq_ptr(state, "carrier"))) { diff --git a/src/network/networkctl-util.h b/src/network/networkctl-util.h index df4ef40347..6067602d1a 100644 --- a/src/network/networkctl-util.h +++ b/src/network/networkctl-util.h @@ -7,15 +7,6 @@ int varlink_connect_networkd(sd_varlink **ret_varlink); int reload_networkd(void); int reload_udevd(void); bool networkd_is_running(void); -int acquire_bus(sd_bus **ret); -int link_get_property( - sd_bus *bus, - int ifindex, - sd_bus_error *error, - sd_bus_message **reply, - const char *iface, - const char *propname, - const char *type); void operational_state_to_color(const char *name, const char *state, const char **on, const char **off); void setup_state_to_color(const char *state, const char **on, const char **off);