diff options
author | Yu Watanabe <watanabe.yu+github@gmail.com> | 2021-05-25 15:00:33 +0900 |
---|---|---|
committer | Yu Watanabe <watanabe.yu+github@gmail.com> | 2021-06-08 06:33:27 +0900 |
commit | d24bf1b514ea68ea60ff6207082ff49ed6646962 (patch) | |
tree | ba9434a722aafd45d9121c66d143df1e83d67d75 /src | |
parent | 8e00e24cc98a18870a877fff05e34ab9f95a83c7 (diff) | |
download | systemd-d24bf1b514ea68ea60ff6207082ff49ed6646962.tar.gz |
network: introduce link_request_to_set_master()
The function will be used later.
Diffstat (limited to 'src')
-rw-r--r-- | src/network/networkd-setlink.c | 70 | ||||
-rw-r--r-- | src/network/networkd-setlink.h | 2 |
2 files changed, 72 insertions, 0 deletions
diff --git a/src/network/networkd-setlink.c b/src/network/networkd-setlink.c index 89b414a321..0bcd2a4d95 100644 --- a/src/network/networkd-setlink.c +++ b/src/network/networkd-setlink.c @@ -16,6 +16,7 @@ static const char *const set_link_operation_table[_SET_LINK_OPERATION_MAX] = { [SET_LINK_FLAGS] = "link flags", [SET_LINK_GROUP] = "interface group", [SET_LINK_MAC] = "MAC address", + [SET_LINK_MASTER] = "master interface", [SET_LINK_MTU] = "MTU", }; @@ -78,6 +79,10 @@ static int link_set_mac_handler(sd_netlink *rtnl, sd_netlink_message *m, Link *l return set_link_handler_internal(rtnl, m, link, SET_LINK_MAC, true); } +static int link_set_master_handler(sd_netlink *rtnl, sd_netlink_message *m, Link *link) { + return set_link_handler_internal(rtnl, m, link, SET_LINK_MASTER, true); +} + static int link_set_mtu_handler(sd_netlink *rtnl, sd_netlink_message *m, Link *link) { int r; @@ -183,6 +188,11 @@ static int link_configure( if (r < 0) return log_link_debug_errno(link, r, "Could not append IFLA_ADDRESS attribute: %m"); break; + case SET_LINK_MASTER: + r = sd_netlink_message_append_u32(req, IFLA_MASTER, PTR_TO_UINT32(userdata)); + if (r < 0) + return log_link_debug_errno(link, r, "Could not append IFLA_MASTER attribute: %m"); + break; case SET_LINK_MTU: r = sd_netlink_message_append_u32(req, IFLA_MTU, PTR_TO_UINT32(userdata)); if (r < 0) @@ -201,16 +211,70 @@ static int link_configure( return 0; } +static bool netdev_is_ready(NetDev *netdev) { + assert(netdev); + + if (netdev->state != NETDEV_STATE_READY) + return false; + if (netdev->ifindex == 0) + return false; + + return true; +} + static bool link_is_ready_to_call_set_link(Request *req) { + SetLinkOperation op; Link *link; + int r; assert(req); link = req->link; + op = req->set_link_operation; if (!IN_SET(link->state, LINK_STATE_INITIALIZED, LINK_STATE_CONFIGURING, LINK_STATE_CONFIGURED)) return false; + switch (op) { + case SET_LINK_MASTER: { + uint32_t m = 0; + + assert(link->network); + + if (link->network->batadv) { + if (!netdev_is_ready(link->network->batadv)) + return false; + m = link->network->batadv->ifindex; + } else if (link->network->bond) { + if (!netdev_is_ready(link->network->bond)) + return false; + m = link->network->bond->ifindex; + + if (FLAGS_SET(link->flags, IFF_UP)) { + /* link must be down when joining to bond master. */ + r = link_down(link, NULL); + if (r < 0) { + link_enter_failed(link); + return false; + } + } + } else if (link->network->bridge) { + if (!netdev_is_ready(link->network->bridge)) + return false; + m = link->network->bridge->ifindex; + } else if (link->network->vrf) { + if (!netdev_is_ready(link->network->vrf)) + return false; + m = link->network->vrf->ifindex; + } + + req->userdata = UINT32_TO_PTR(m); + break; + } + default: + break; + } + return true; } @@ -329,6 +393,12 @@ int link_request_to_set_mac(Link *link) { return link_request_set_link(link, SET_LINK_MAC, link_set_mac_handler, NULL); } +int link_request_to_set_master(Link *link) { + assert(link); + + return link_request_set_link(link, SET_LINK_MASTER, link_set_master_handler, NULL); +} + int link_request_to_set_mtu(Link *link, uint32_t mtu) { Request *req = NULL; /* avoid false maybe-uninitialized warning */ int r; diff --git a/src/network/networkd-setlink.h b/src/network/networkd-setlink.h index 33f1bbd37a..8baf7829ed 100644 --- a/src/network/networkd-setlink.h +++ b/src/network/networkd-setlink.h @@ -11,6 +11,7 @@ typedef enum SetLinkOperation { SET_LINK_FLAGS, /* Setting IFF_NOARP or friends. */ SET_LINK_GROUP, /* Setting interface group. */ SET_LINK_MAC, /* Setting MAC address. */ + SET_LINK_MASTER, /* Setting IFLA_MASTER. */ SET_LINK_MTU, /* Setting MTU. */ _SET_LINK_OPERATION_MAX, _SET_LINK_OPERATION_INVALID = -EINVAL, @@ -20,6 +21,7 @@ int link_request_to_set_addrgen_mode(Link *link); int link_request_to_set_flags(Link *link); int link_request_to_set_group(Link *link); int link_request_to_set_mac(Link *link); +int link_request_to_set_master(Link *link); int link_request_to_set_mtu(Link *link, uint32_t mtu); int link_configure_mtu(Link *link); |