SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

networkctl: call all verb functions verb_*

Browse Source
This commit is contained in:
Zbigniew Jędrzejewski-Szmek
2026-03-18 10:28:47 +00:00
committed by Luca Boccassi
parent 3d72ffc415
commit 26216a7e95
11 changed files with 30 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/network/networkctl-address-label.c
+1 -1
View File
@@ -89,7 +89,7 @@ static int dump_address_labels(sd_netlink *rtnl) {
return 0;
}
int list_address_labels(int argc, char *argv[], void *userdata) {
int verb_list_address_labels(int argc, char *argv[], void *userdata) {
_cleanup_(sd_netlink_unrefp) sd_netlink *rtnl = NULL;
int r;
src/network/networkctl-address-label.h
+1 -1
View File
@@ -1,4 +1,4 @@
/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
int list_address_labels(int argc, char *argv[], void *userdata);
int verb_list_address_labels(int argc, char *argv[], void *userdata);
src/network/networkctl-list.c
+1 -1
View File
@@ -12,7 +12,7 @@
#include "networkctl-list.h"
#include "networkctl-util.h"
int list_links(int argc, char *argv[], void *userdata) {
int verb_list_links(int argc, char *argv[], void *userdata) {
_cleanup_(sd_netlink_unrefp) sd_netlink *rtnl = NULL;
_cleanup_(link_info_array_freep) LinkInfo *links = NULL;
_cleanup_(table_unrefp) Table *table = NULL;
src/network/networkctl-list.h
+1 -1
View File
@@ -1,4 +1,4 @@
/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
int list_links(int argc, char *argv[], void *userdata);
int verb_list_links(int argc, char *argv[], void *userdata);
src/network/networkctl-lldp.c
+1 -1
View File
@@ -219,7 +219,7 @@ static int dump_lldp_neighbors_json(sd_json_variant *reply, char * const *patter
return sd_json_variant_dump(v, arg_json_format_flags, NULL, NULL);
}
int link_lldp_status(int argc, char *argv[], void *userdata) {
int verb_link_lldp_status(int argc, char *argv[], void *userdata) {
_cleanup_(sd_varlink_flush_close_unrefp) sd_varlink *vl = NULL;
_cleanup_(table_unrefp) Table *table = NULL;
sd_json_variant *reply;
src/network/networkctl-lldp.h
+1 -1
View File
@@ -4,4 +4,4 @@
#include "shared-forward.h"
int dump_lldp_neighbors(sd_varlink *vl, Table *table, int ifindex);
int link_lldp_status(int argc, char *argv[], void *userdata);
int verb_link_lldp_status(int argc, char *argv[], void *userdata);
src/network/networkctl-misc.c
+3 -3
View File
@@ -46,7 +46,7 @@ static int parse_interfaces(sd_netlink **rtnl, char *argv[], OrderedSet **ret) {
return 0;
}
int link_up_down(int argc, char *argv[], void *userdata) {
int verb_link_up_down(int argc, char *argv[], void *userdata) {
int r, ret = 0;
bool up = streq_ptr(argv[0], "up");
@@ -75,7 +75,7 @@ int link_up_down(int argc, char *argv[], void *userdata) {
return ret;
}
int link_delete(int argc, char *argv[], void *userdata) {
int verb_link_delete(int argc, char *argv[], void *userdata) {
int r, ret = 0;
_cleanup_(sd_netlink_unrefp) sd_netlink *rtnl = NULL;
@@ -104,7 +104,7 @@ int link_delete(int argc, char *argv[], void *userdata) {
return ret;
}
int link_bus_simple_method(int argc, char *argv[], void *userdata) {
int verb_link_bus_simple_method(int argc, char *argv[], void *userdata) {
int r, ret = 0;
typedef struct LinkBusAction {
src/network/networkctl-misc.h
+3 -3
View File
@@ -1,8 +1,8 @@
/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
int link_up_down(int argc, char *argv[], void *userdata);
int link_delete(int argc, char *argv[], void *userdata);
int link_bus_simple_method(int argc, char *argv[], void *userdata);
int verb_link_up_down(int argc, char *argv[], void *userdata);
int verb_link_delete(int argc, char *argv[], void *userdata);
int verb_link_bus_simple_method(int argc, char *argv[], void *userdata);
int verb_reload(int argc, char *argv[], void *userdata);
int verb_persistent_storage(int argc, char *argv[], void *userdata);
src/network/networkctl-status-link.c
+1 -1
View File
@@ -939,7 +939,7 @@ static int link_status_one(
return show_logs(info->ifindex, info->name);
}
int link_status(int argc, char *argv[], void *userdata) {
int verb_link_status(int argc, char *argv[], void *userdata) {
_cleanup_(sd_bus_flush_close_unrefp) sd_bus *bus = NULL;
_cleanup_(sd_netlink_unrefp) sd_netlink *rtnl = NULL;
_cleanup_(sd_hwdb_unrefp) sd_hwdb *hwdb = NULL;
src/network/networkctl-status-link.h
+1 -1
View File
@@ -1,4 +1,4 @@
/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
int link_status(int argc, char *argv[], void *userdata);
int verb_link_status(int argc, char *argv[], void *userdata);
src/network/networkctl.c
+16 -16
View File
@@ -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, list_links },
{ "status", VERB_ANY, VERB_ANY, VERB_ONLINE_ONLY, link_status },
{ "lldp", VERB_ANY, VERB_ANY, 0, link_lldp_status },
{ "label", 1, 1, 0, list_address_labels },
{ "delete", 2, VERB_ANY, 0, link_delete },
{ "up", 2, VERB_ANY, 0, link_up_down },
{ "down", 2, VERB_ANY, 0, link_up_down },
{ "renew", 2, VERB_ANY, VERB_ONLINE_ONLY, link_bus_simple_method },
{ "forcerenew", 2, VERB_ANY, VERB_ONLINE_ONLY, link_bus_simple_method },
{ "reconfigure", 2, VERB_ANY, VERB_ONLINE_ONLY, 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_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 },
{}
};