resolvectl: consolidate JSON and regular status output paths

Now that varlink is always used for status output, consolidate the JSON
and regular status code paths. Add status_full(), which is the single
point that calls DumpDNSConfiguration, filters based on link names and
mode if needed, and prints the output in the appropriate format.

This simplifies status_ifindex(), and removes the need for a separate
status_json().

diff --git a/src/resolve/resolvectl.c b/src/resolve/resolvectl.c
index 9d86c5f6fc131b539c1e3cb1b749bb2c4b6224c9..a6074a3ade0b24202d1493761897c85f2b2c8e1e 100644 (file)
--- a/src/resolve/resolvectl.c
+++ b/src/resolve/resolvectl.c
@@ -1555,25 +1555,6 @@ static int varlink_dump_dns_configuration(sd_json_variant **ret) {
         return 0;
 }
 
-static int status_json(StatusMode mode, char **links) {
-        _cleanup_(sd_json_variant_unrefp) sd_json_variant *configuration = NULL;
-        int r;
-
-        r = varlink_dump_dns_configuration(&configuration);
-        if (r < 0)
-                return r;
-
-        r = status_json_filter_links(&configuration, links);
-        if (r < 0)
-                return log_error_errno(r, "Failed to filter configuration JSON links: %m");
-
-        r = status_json_filter_fields(&configuration, mode);
-        if (r < 0)
-                return log_error_errno(r, "Failed to filter configuration JSON fields: %m");
-
-        return sd_json_variant_dump(configuration, arg_json_format_flags, /* f= */ NULL, /* prefix= */ NULL);
-}
-
 static int format_dns_server_one(DNSServer *s, bool with_ifindex, bool only_global, char **ret) {
         int r;
 
@@ -1909,42 +1890,6 @@ static int status_link(DNSConfiguration *configuration, StatusMode mode, bool *e
         return 0;
 }
 
-static int status_ifindex(int ifindex, StatusMode mode, bool *empty_line) {
-        int r;
-
-        assert(ifindex > 0);
-
-        if (sd_json_format_enabled(arg_json_format_flags)) {
-                char ifname[IF_NAMESIZE];
-                r = format_ifname(ifindex, ifname);
-                if (r < 0)
-                        return log_error_errno(r, "Failed to resolve interface name for %i: %m", ifindex);
-
-                return status_json(mode, STRV_MAKE(ifname));
-        }
-
-        _cleanup_(sd_json_variant_unrefp) sd_json_variant *v = NULL;
-        r = varlink_dump_dns_configuration(&v);
-        if (r < 0)
-                return r;
-
-        sd_json_variant *w;
-        JSON_VARIANT_ARRAY_FOREACH(w, v) {
-                int found = sd_json_variant_unsigned(sd_json_variant_by_key(w, "ifindex"));
-                if (found != ifindex)
-                        continue;
-
-                _cleanup_(dns_configuration_freep) DNSConfiguration *c = NULL;
-                r = dns_configuration_from_json(w, &c);
-                if (r < 0)
-                        return r;
-
-                return status_link(c, mode, empty_line);
-        }
-
-        return log_error_errno(SYNTHETIC_ERRNO(ENODEV), "No DNS configuration for interface %d", ifindex);
-}
-
 static int status_global(DNSConfiguration *configuration, StatusMode mode, bool *empty_line) {
         _cleanup_(table_unrefp) Table *table = NULL;
         int r;
@@ -2222,18 +2167,27 @@ static int status_delegate(DNSConfiguration *configuration, StatusMode mode, boo
         return 0;
 }
 
-static int status_all(StatusMode mode) {
+static int status_full(StatusMode mode, char **links) {
         bool empty_line = false;
         int r;
 
-        if (sd_json_format_enabled(arg_json_format_flags))
-                return status_json(mode, /* links= */ NULL);
-
         _cleanup_(sd_json_variant_unrefp) sd_json_variant *v = NULL;
         r = varlink_dump_dns_configuration(&v);
         if (r < 0)
                 return r;
 
+        r = status_json_filter_links(&v, links);
+        if (r < 0)
+                return log_error_errno(r, "Failed to filter configuration JSON links: %m");
+
+        if (sd_json_format_enabled(arg_json_format_flags)) {
+                r = status_json_filter_fields(&v, mode);
+                if (r < 0)
+                        return log_error_errno(r, "Failed to filter configuration JSON fields: %m");
+
+                return sd_json_variant_dump(v, arg_json_format_flags, /* f= */ NULL, /* prefix= */ NULL);
+        }
+
         _cleanup_(dns_configuration_freep) DNSConfiguration *global_config = NULL;
         _cleanup_ordered_set_free_ OrderedSet *link_configs = NULL, *delegate_configs = NULL;
         sd_json_variant *w;
@@ -2243,9 +2197,6 @@ static int status_all(StatusMode mode) {
                 if (r < 0)
                         return r;
 
-                if (c->ifindex == LOOPBACK_IFINDEX)
-                        continue;
-
                 if (c->ifindex > 0) {
                         r = ordered_set_ensure_put(&link_configs, &dns_configuration_hash_ops, c);
                         if (r < 0)
@@ -2284,30 +2235,25 @@ static int status_all(StatusMode mode) {
         return 0;
 }
 
-static int verb_status(int argc, char **argv, void *userdata) {
-        _cleanup_(sd_netlink_unrefp) sd_netlink *rtnl = NULL;
-        bool empty_line = false;
-        int ret = 0;
-
-        if (sd_json_format_enabled(arg_json_format_flags))
-                return status_json(STATUS_ALL, argc > 1 ? strv_skip(argv, 1) : NULL);
+static int status_all(StatusMode mode) {
+        return status_full(mode, /* links= */ NULL);
+}
 
-        if (argc <= 1)
-                return status_all(STATUS_ALL);
+static int status_ifindex(int ifindex, StatusMode mode) {
+        int r;
+        char ifname[IF_NAMESIZE];
 
-        STRV_FOREACH(ifname, strv_skip(argv, 1)) {
-                int ifindex;
+        assert(ifindex > 0);
 
-                ifindex = rtnl_resolve_interface(&rtnl, *ifname);
-                if (ifindex < 0) {
-                        log_warning_errno(ifindex, "Failed to resolve interface \"%s\", ignoring: %m", *ifname);
-                        continue;
-                }
+        r = format_ifname(ifindex, ifname);
+        if (r < 0)
+                return log_error_errno(r, "Failed to resolve interface name for %i: %m", ifindex);
 
-                RET_GATHER(ret, status_ifindex(ifindex, STATUS_ALL, &empty_line));
-        }
+        return status_full(mode, STRV_MAKE(ifname));
+}
 
-        return ret;
+static int verb_status(int argc, char **argv, void *userdata) {
+        return status_full(STATUS_ALL, strv_skip(argv, 1));
 }
 
 static int call_dns(sd_bus *bus, char **dns, const BusLocator *locator, sd_bus_error *error, bool extended) {
@@ -2402,7 +2348,7 @@ static int verb_dns(int argc, char **argv, void *userdata) {
                 return status_all(STATUS_DNS);
 
         if (argc < 3)
-                return status_ifindex(arg_ifindex, STATUS_DNS, NULL);
+                return status_ifindex(arg_ifindex, STATUS_DNS);
 
         char **args = strv_skip(argv, 2);
         r = call_dns(bus, args, bus_resolve_mgr, &error, true);
@@ -2487,7 +2433,7 @@ static int verb_domain(int argc, char **argv, void *userdata) {
                 return status_all(STATUS_DOMAIN);
 
         if (argc < 3)
-                return status_ifindex(arg_ifindex, STATUS_DOMAIN, NULL);
+                return status_ifindex(arg_ifindex, STATUS_DOMAIN);
 
         char **args = strv_skip(argv, 2);
         r = call_domain(bus, args, bus_resolve_mgr, &error);
@@ -2526,7 +2472,7 @@ static int verb_default_route(int argc, char **argv, void *userdata) {
                 return status_all(STATUS_DEFAULT_ROUTE);
 
         if (argc < 3)
-                return status_ifindex(arg_ifindex, STATUS_DEFAULT_ROUTE, NULL);
+                return status_ifindex(arg_ifindex, STATUS_DEFAULT_ROUTE);
 
         b = parse_boolean(argv[2]);
         if (b < 0)
@@ -2572,7 +2518,7 @@ static int verb_llmnr(int argc, char **argv, void *userdata) {
                 return status_all(STATUS_LLMNR);
 
         if (argc < 3)
-                return status_ifindex(arg_ifindex, STATUS_LLMNR, NULL);
+                return status_ifindex(arg_ifindex, STATUS_LLMNR);
 
         llmnr_support = resolve_support_from_string(argv[2]);
         if (llmnr_support < 0)
@@ -2630,7 +2576,7 @@ static int verb_mdns(int argc, char **argv, void *userdata) {
                 return status_all(STATUS_MDNS);
 
         if (argc < 3)
-                return status_ifindex(arg_ifindex, STATUS_MDNS, NULL);
+                return status_ifindex(arg_ifindex, STATUS_MDNS);
 
         mdns_support = resolve_support_from_string(argv[2]);
         if (mdns_support < 0)
@@ -2692,7 +2638,7 @@ static int verb_dns_over_tls(int argc, char **argv, void *userdata) {
                 return status_all(STATUS_DNS_OVER_TLS);
 
         if (argc < 3)
-                return status_ifindex(arg_ifindex, STATUS_DNS_OVER_TLS, NULL);
+                return status_ifindex(arg_ifindex, STATUS_DNS_OVER_TLS);
 
         (void) polkit_agent_open_if_enabled(BUS_TRANSPORT_LOCAL, arg_ask_password);
 
@@ -2738,7 +2684,7 @@ static int verb_dnssec(int argc, char **argv, void *userdata) {
                 return status_all(STATUS_DNSSEC);
 
         if (argc < 3)
-                return status_ifindex(arg_ifindex, STATUS_DNSSEC, NULL);
+                return status_ifindex(arg_ifindex, STATUS_DNSSEC);
 
         (void) polkit_agent_open_if_enabled(BUS_TRANSPORT_LOCAL, arg_ask_password);
 
@@ -2801,7 +2747,7 @@ static int verb_nta(int argc, char **argv, void *userdata) {
                 return status_all(STATUS_NTA);
 
         if (argc < 3)
-                return status_ifindex(arg_ifindex, STATUS_NTA, NULL);
+                return status_ifindex(arg_ifindex, STATUS_NTA);
 
         (void) polkit_agent_open_if_enabled(BUS_TRANSPORT_LOCAL, arg_ask_password);