networkctl: use new varlink methods

Co-developed-by: Claude Opus 4.6 <noreply@anthropic.com>

diff --git a/src/network/networkctl-misc.c b/src/network/networkctl-misc.c
index e130cdab4c67832f4648d4634855c04b6a64efeb..2596c144093ccccf2d3a05ee293958601aae30ad 100644 (file)
--- a/src/network/networkctl-misc.c
+++ b/src/network/networkctl-misc.c
@@ -46,35 +46,6 @@ static int parse_interfaces(sd_netlink **rtnl, char *argv[], OrderedSet **ret) {
         return 0;
 }
 
-int verb_link_up_down(int argc, char *argv[], uintptr_t _data, void *userdata) {
-        int r, ret = 0;
-
-        bool up = streq_ptr(argv[0], "up");
-
-        _cleanup_ordered_set_free_ OrderedSet *indexes = NULL;
-        r = parse_interfaces(/* rtnl= */ NULL, argv, &indexes);
-        if (r < 0)
-                return r;
-
-        _cleanup_(sd_varlink_flush_close_unrefp) sd_varlink *vl = NULL;
-        r = varlink_connect_networkd(&vl);
-        if (r < 0)
-                return r;
-
-        (void) polkit_agent_open_if_enabled(BUS_TRANSPORT_LOCAL, arg_ask_password);
-
-        void *p;
-        ORDERED_SET_FOREACH(p, indexes)
-                RET_GATHER(ret, varlink_callbo_and_log(
-                                           vl,
-                                           up ? "io.systemd.Network.Link.Up" : "io.systemd.Network.Link.Down",
-                                           /* reply= */ NULL,
-                                           SD_JSON_BUILD_PAIR_INTEGER("InterfaceIndex", PTR_TO_INT(p)),
-                                           SD_JSON_BUILD_PAIR_BOOLEAN("allowInteractiveAuthentication", arg_ask_password)));
-
-        return ret;
-}
-
 int verb_link_delete(int argc, char *argv[], uintptr_t _data, void *userdata) {
         int r, ret = 0;
 
@@ -104,25 +75,26 @@ int verb_link_delete(int argc, char *argv[], uintptr_t _data, void *userdata) {
         return ret;
 }
 
-int verb_link_bus_simple_method(int argc, char *argv[], uintptr_t _data, void *userdata) {
+int verb_link_varlink_simple_method(int argc, char *argv[], uintptr_t _data, void *userdata) {
         int r, ret = 0;
 
-        typedef struct LinkBusAction {
+        typedef struct LinkVarlinkAction {
                 const char *verb;
-                const char *bus_method;
-                const char *error_message;
-        } LinkBusAction;
-
-        static const LinkBusAction link_bus_action_table[] = {
-                { "renew",       "RenewLink",       "Failed to renew dynamic configuration of interface"          },
-                { "forcerenew",  "ForceRenewLink",  "Failed to forcibly renew dynamic configuration of interface" },
-                { "reconfigure", "ReconfigureLink", "Failed to reconfigure network interface"                     },
+                const char *method;
+        } LinkVarlinkAction;
+
+        static const LinkVarlinkAction link_varlink_action_table[] = {
+                { "up",          "io.systemd.Network.Link.Up",          },
+                { "down",        "io.systemd.Network.Link.Down",        },
+                { "renew",       "io.systemd.Network.Link.Renew",       },
+                { "forcerenew",  "io.systemd.Network.Link.ForceRenew",  },
+                { "reconfigure", "io.systemd.Network.Link.Reconfigure", },
         };
 
         /* Common implementation for 'simple' method calls that just take an ifindex, and nothing else. */
 
-        const LinkBusAction *a = NULL;
-        FOREACH_ELEMENT(i, link_bus_action_table)
+        const LinkVarlinkAction *a = NULL;
+        FOREACH_ELEMENT(i, link_varlink_action_table)
                 if (streq(argv[0], i->verb)) {
                         a = i;
                         break;
@@ -134,27 +106,21 @@ int verb_link_bus_simple_method(int argc, char *argv[], uintptr_t _data, void *u
         if (r < 0)
                 return r;
 
-        _cleanup_(sd_bus_flush_close_unrefp) sd_bus *bus = NULL;
-        r = acquire_bus(&bus);
+        _cleanup_(sd_varlink_flush_close_unrefp) sd_varlink *vl = NULL;
+        r = varlink_connect_networkd(&vl);
         if (r < 0)
                 return r;
 
         (void) polkit_agent_open_if_enabled(BUS_TRANSPORT_LOCAL, arg_ask_password);
 
         void *p;
-        ORDERED_SET_FOREACH(p, indexes) {
-                _cleanup_(sd_bus_error_free) sd_bus_error error = SD_BUS_ERROR_NULL;
-                int index = PTR_TO_INT(p);
-
-                r = bus_call_method(bus, bus_network_mgr, a->bus_method, &error, /* ret_reply= */ NULL, "i", index);
-                if (r < 0) {
-                        RET_GATHER(ret, r);
-                        log_error_errno(r, "%s %s: %s",
-                                        a->error_message,
-                                        FORMAT_IFNAME_FULL(index, FORMAT_IFNAME_IFINDEX),
-                                        bus_error_message(&error, r));
-                }
-        }
+        ORDERED_SET_FOREACH(p, indexes)
+                RET_GATHER(ret, varlink_callbo_and_log(
+                                           vl,
+                                           a->method,
+                                           /* reply= */ NULL,
+                                           SD_JSON_BUILD_PAIR_INTEGER("InterfaceIndex", PTR_TO_INT(p)),
+                                           SD_JSON_BUILD_PAIR_BOOLEAN("allowInteractiveAuthentication", arg_ask_password)));
 
         return ret;
 }

diff --git a/src/network/networkctl-misc.h b/src/network/networkctl-misc.h
index 092177275d7464cb739d586ee3ce3b5a4912b89c..771761d05f2682f75bf7dffae74b304360289d0b 100644 (file)
--- a/src/network/networkctl-misc.h
+++ b/src/network/networkctl-misc.h
@@ -3,8 +3,7 @@
 
 #include "shared-forward.h"
 
-int verb_link_up_down(int argc, char *argv[], uintptr_t _data, void *userdata);
 int verb_link_delete(int argc, char *argv[], uintptr_t _data, void *userdata);
-int verb_link_bus_simple_method(int argc, char *argv[], uintptr_t _data, void *userdata);
+int verb_link_varlink_simple_method(int argc, char *argv[], uintptr_t _data, void *userdata);
 int verb_reload(int argc, char *argv[], uintptr_t _data, void *userdata);
 int verb_persistent_storage(int argc, char *argv[], uintptr_t _data, void *userdata);

diff --git a/src/network/networkctl.c b/src/network/networkctl.c
index 91379cc9308f5a5f8f7d6a59f89d80dc64c06d70..7fe34ac1eb77827117221bed870629bdbbbc5673 100644 (file)
--- a/src/network/networkctl.c
+++ b/src/network/networkctl.c
@@ -223,22 +223,22 @@ static int parse_argv(int argc, char *argv[]) {
 
 static int networkctl_main(int argc, char *argv[]) {
         static const Verb verbs[] = {
-                { "list",               VERB_ANY, VERB_ANY, VERB_DEFAULT|VERB_ONLINE_ONLY, verb_list_links              },
-                { "status",             VERB_ANY, VERB_ANY, VERB_ONLINE_ONLY,              verb_link_status             },
-                { "lldp",               VERB_ANY, VERB_ANY, 0,                             verb_link_lldp_status        },
-                { "label",              1,        1,        0,                             verb_list_address_labels     },
-                { "delete",             2,        VERB_ANY, 0,                             verb_link_delete             },
-                { "up",                 2,        VERB_ANY, 0,                             verb_link_up_down            },
-                { "down",               2,        VERB_ANY, 0,                             verb_link_up_down            },
-                { "renew",              2,        VERB_ANY, VERB_ONLINE_ONLY,              verb_link_bus_simple_method  },
-                { "forcerenew",         2,        VERB_ANY, VERB_ONLINE_ONLY,              verb_link_bus_simple_method  },
-                { "reconfigure",        2,        VERB_ANY, VERB_ONLINE_ONLY,              verb_link_bus_simple_method  },
-                { "reload",             1,        1,        VERB_ONLINE_ONLY,              verb_reload                  },
-                { "edit",               2,        VERB_ANY, 0,                             verb_edit                    },
-                { "cat",                1,        VERB_ANY, 0,                             verb_cat                     },
-                { "mask",               2,        VERB_ANY, 0,                             verb_mask                    },
-                { "unmask",             2,        VERB_ANY, 0,                             verb_unmask                  },
-                { "persistent-storage", 2,        2,        0,                             verb_persistent_storage      },
+                { "list",               VERB_ANY, VERB_ANY, VERB_DEFAULT|VERB_ONLINE_ONLY, verb_list_links                    },
+                { "status",             VERB_ANY, VERB_ANY, VERB_ONLINE_ONLY,              verb_link_status                   },
+                { "lldp",               VERB_ANY, VERB_ANY, 0,                             verb_link_lldp_status              },
+                { "label",              1,        1,        0,                             verb_list_address_labels           },
+                { "delete",             2,        VERB_ANY, 0,                             verb_link_delete                   },
+                { "up",                 2,        VERB_ANY, 0,                             verb_link_varlink_simple_method    },
+                { "down",               2,        VERB_ANY, 0,                             verb_link_varlink_simple_method    },
+                { "renew",              2,        VERB_ANY, VERB_ONLINE_ONLY,              verb_link_varlink_simple_method    },
+                { "forcerenew",         2,        VERB_ANY, VERB_ONLINE_ONLY,              verb_link_varlink_simple_method    },
+                { "reconfigure",        2,        VERB_ANY, VERB_ONLINE_ONLY,              verb_link_varlink_simple_method    },
+                { "reload",             1,        1,        VERB_ONLINE_ONLY,              verb_reload                        },
+                { "edit",               2,        VERB_ANY, 0,                             verb_edit                          },
+                { "cat",                1,        VERB_ANY, 0,                             verb_cat                           },
+                { "mask",               2,        VERB_ANY, 0,                             verb_mask                          },
+                { "unmask",             2,        VERB_ANY, 0,                             verb_unmask                        },
+                { "persistent-storage", 2,        2,        0,                             verb_persistent_storage            },
                 {}
         };