X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fnetwork%2Fnetworkd-netdev.c;h=86f2250c8ffbcfd091b059b29c03cb4770412cc9;hp=88b692fbabf5cff75a3e6171bf1323854efe9606;hb=ca4e095ab9e970cb8fa472ae69ea1f0648041722;hpb=fe8ac65b683ec7408b26ba40040134e6d66b1c5c diff --git a/src/network/networkd-netdev.c b/src/network/networkd-netdev.c index 88b692fba..86f2250c8 100644 --- a/src/network/networkd-netdev.c +++ b/src/network/networkd-netdev.c @@ -21,7 +21,16 @@ #include -#include "networkd.h" +#include "networkd-netdev.h" +#include "networkd-netdev-bridge.h" +#include "networkd-netdev-bond.h" +#include "networkd-netdev-vlan.h" +#include "networkd-netdev-macvlan.h" +#include "networkd-netdev-vxlan.h" +#include "networkd-netdev-tunnel.h" +#include "networkd-netdev-veth.h" +#include "networkd-netdev-dummy.h" +#include "networkd-netdev-tuntap.h" #include "network-internal.h" #include "path-util.h" #include "conf-files.h" @@ -29,6 +38,22 @@ #include "list.h" #include "siphash24.h" +const NetDevVTable * const netdev_vtable[_NETDEV_KIND_MAX] = { + [NETDEV_KIND_BRIDGE] = &bridge_vtable, + [NETDEV_KIND_BOND] = &bond_vtable, + [NETDEV_KIND_VLAN] = &vlan_vtable, + [NETDEV_KIND_MACVLAN] = &macvlan_vtable, + [NETDEV_KIND_VXLAN] = &vxlan_vtable, + [NETDEV_KIND_IPIP] = &ipip_vtable, + [NETDEV_KIND_GRE] = &gre_vtable, + [NETDEV_KIND_SIT] = &sit_vtable, + [NETDEV_KIND_VTI] = &vti_vtable, + [NETDEV_KIND_VETH] = &veth_vtable, + [NETDEV_KIND_DUMMY] = &dummy_vtable, + [NETDEV_KIND_TUN] = &tun_vtable, + [NETDEV_KIND_TAP] = &tap_vtable, +}; + static const char* const netdev_kind_table[_NETDEV_KIND_MAX] = { [NETDEV_KIND_BRIDGE] = "bridge", [NETDEV_KIND_BOND] = "bond", @@ -51,7 +76,7 @@ DEFINE_CONFIG_PARSE_ENUM(config_parse_netdev_kind, netdev_kind, NetDevKind, "Fai static void netdev_cancel_callbacks(NetDev *netdev) { _cleanup_rtnl_message_unref_ sd_rtnl_message *m = NULL; - netdev_enslave_callback *callback; + netdev_join_callback *callback; if (!netdev) return; @@ -161,6 +186,7 @@ static int netdev_enslave_ready(NetDev *netdev, Link* link, sd_rtnl_message_hand assert(netdev->state == NETDEV_STATE_READY); assert(netdev->manager); assert(netdev->manager->rtnl); + assert(IN_SET(netdev->kind, NETDEV_KIND_BRIDGE, NETDEV_KIND_BOND)); assert(link); assert(callback); @@ -197,7 +223,7 @@ static int netdev_enslave_ready(NetDev *netdev, Link* link, sd_rtnl_message_hand } static int netdev_enter_ready(NetDev *netdev) { - netdev_enslave_callback *callback, *callback_next; + netdev_join_callback *callback, *callback_next; int r; assert(netdev); @@ -245,144 +271,69 @@ static int netdev_create_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userda return 1; } -static int netdev_create(NetDev *netdev) { - _cleanup_rtnl_message_unref_ sd_rtnl_message *req = NULL; - const char *kind; +int netdev_enslave(NetDev *netdev, Link *link, sd_rtnl_message_handler_t callback) { int r; assert(netdev); - assert(netdev->ifname); - assert(netdev->manager); - assert(netdev->manager->rtnl); - - r = sd_rtnl_message_new_link(netdev->manager->rtnl, &req, RTM_NEWLINK, 0); - if (r < 0) { - log_error_netdev(netdev, - "Could not allocate RTM_NEWLINK message: %s", - strerror(-r)); - return r; - } - - r = sd_rtnl_message_append_string(req, IFLA_IFNAME, netdev->ifname); - if (r < 0) { - log_error_netdev(netdev, - "Could not append IFLA_IFNAME attribute: %s", - strerror(-r)); - return r; - } + assert(IN_SET(netdev->kind, NETDEV_KIND_BRIDGE, NETDEV_KIND_BOND)); - if (netdev->mtu) { - r = sd_rtnl_message_append_u32(req, IFLA_MTU, netdev->mtu); - if (r < 0) { - log_error_netdev(netdev, - "Could not append IFLA_MTU attribute: %s", - strerror(-r)); + if (netdev->state == NETDEV_STATE_READY) { + r = netdev_enslave_ready(netdev, link, callback); + if (r < 0) return r; - } - } - - if (netdev->mac) { - r = sd_rtnl_message_append_ether_addr(req, IFLA_ADDRESS, netdev->mac); - if (r < 0) { - log_error_netdev(netdev, - "Colud not append IFLA_ADDRESS attribute: %s", - strerror(-r)); - return r; - } - } - - r = sd_rtnl_message_open_container(req, IFLA_LINKINFO); - if (r < 0) { - log_error_netdev(netdev, - "Could not open IFLA_LINKINFO container: %s", - strerror(-r)); - return r; - } - - kind = netdev_kind_to_string(netdev->kind); - if (!kind) { - log_error_netdev(netdev, "Invalid kind"); - return -EINVAL; - } - - r = sd_rtnl_message_open_container_union(req, IFLA_INFO_DATA, kind); - if (r < 0) { - log_error_netdev(netdev, - "Could not open IFLA_INFO_DATA container: %s", - strerror(-r)); - return r; - } + } else { + /* the netdev is not yet read, save this request for when it is*/ + netdev_join_callback *cb; - r = sd_rtnl_message_close_container(req); - if (r < 0) { - log_error_netdev(netdev, - "Could not close IFLA_INFO_DATA container %s", - strerror(-r)); - return r; - } + cb = new0(netdev_join_callback, 1); + if (!cb) + return log_oom(); - r = sd_rtnl_message_close_container(req); - if (r < 0) { - log_error_netdev(netdev, - "Could not close IFLA_LINKINFO container %s", - strerror(-r)); - return r; - } + cb->callback = callback; + cb->link = link; + link_ref(link); - r = sd_rtnl_call_async(netdev->manager->rtnl, req, &netdev_create_handler, netdev, 0, NULL); - if (r < 0) { - log_error_netdev(netdev, - "Could not send rtnetlink message: %s", strerror(-r)); - return r; + LIST_PREPEND(callbacks, netdev->callbacks, cb); } - netdev_ref(netdev); - - log_debug_netdev(netdev, "creating netdev"); - - netdev->state = NETDEV_STATE_CREATING; - return 0; } /* the callback must be called, possibly after a timeout, as otherwise the Link will hang */ -int netdev_enslave(NetDev *netdev, Link *link, sd_rtnl_message_handler_t callback) { +int netdev_join(NetDev *netdev, Link *link, sd_rtnl_message_handler_t callback) { int r; - switch(netdev->kind) { - case NETDEV_KIND_VLAN: - return netdev_create_vlan(netdev, link, callback); - case NETDEV_KIND_MACVLAN: - return netdev_create_macvlan(netdev, link, callback); - case NETDEV_KIND_VXLAN: - return netdev_create_vxlan(netdev, link, callback); - case NETDEV_KIND_IPIP: - case NETDEV_KIND_GRE: - case NETDEV_KIND_SIT: - case NETDEV_KIND_VTI: - return netdev_create_tunnel(netdev, link, callback); - default: - break; - } + assert(netdev); + assert(netdev->manager); + assert(netdev->manager->rtnl); + assert(NETDEV_VTABLE(netdev)); - if (netdev->state == NETDEV_STATE_READY) { - r = netdev_enslave_ready(netdev, link, callback); - if (r < 0) + if (NETDEV_VTABLE(netdev)->fill_message_create_on_link) { + _cleanup_rtnl_message_unref_ sd_rtnl_message *req = NULL; + + r = sd_rtnl_message_new_link(netdev->manager->rtnl, &req, + RTM_NEWLINK, 0); + if (r < 0) { + log_error_netdev(netdev, + "Could not allocate RTM_SETLINK message: %s", + strerror(-r)); return r; - } else { - /* the netdev is not yet read, save this request for when it is*/ - netdev_enslave_callback *cb; + } - cb = new0(netdev_enslave_callback, 1); - if (!cb) - return log_oom(); + NETDEV_VTABLE(netdev)->fill_message_create_on_link(netdev, link, req); - cb->callback = callback; - cb->link = link; - link_ref(link); + r = sd_rtnl_call_async(netdev->manager->rtnl, req, callback, link, 0, NULL); + if (r < 0) { + log_error_netdev(netdev, + "Could not send rtnetlink message: %s", strerror(-r)); + return r; + } - LIST_PREPEND(callbacks, netdev->callbacks, cb); - } + link_ref(link); + } else if (NETDEV_VTABLE(netdev)->enslave) { + return NETDEV_VTABLE(netdev)->enslave(netdev, link, callback); + } else + assert_not_reached("Joining link to netdev of invalid kind"); return 0; } @@ -390,8 +341,8 @@ int netdev_enslave(NetDev *netdev, Link *link, sd_rtnl_message_handler_t callbac int netdev_set_ifindex(NetDev *netdev, sd_rtnl_message *message) { uint16_t type; const char *kind; - char *received_kind; - char *received_name; + const char *received_kind; + const char *received_name; int r, ifindex; assert(netdev); @@ -492,7 +443,7 @@ int netdev_set_ifindex(NetDev *netdev, sd_rtnl_message *message) { #define HASH_KEY SD_ID128_MAKE(52,e1,45,bd,00,6f,29,96,21,c6,30,6d,83,71,04,48) -static int netdev_get_mac(const char *ifname, struct ether_addr **ret) { +int netdev_get_mac(const char *ifname, struct ether_addr **ret) { _cleanup_free_ struct ether_addr *mac = NULL; uint8_t result[8]; size_t l, sz; @@ -544,11 +495,6 @@ static int netdev_load_one(Manager *manager, const char *filename) { assert(manager); assert(filename); - if (null_or_empty_path(filename)) { - log_debug("skipping empty file: %s", filename); - return 0; - } - file = fopen(filename, "re"); if (!file) { if (errno == ENOENT) @@ -557,6 +503,11 @@ static int netdev_load_one(Manager *manager, const char *filename) { return -errno; } + if (null_or_empty_fd(fileno(file))) { + log_debug("Skipping empty file: %s", filename); + return 0; + } + netdev = new0(NetDev, 1); if (!netdev) return log_oom(); @@ -574,48 +525,28 @@ static int netdev_load_one(Manager *manager, const char *filename) { r = config_parse(NULL, filename, file, "Match\0NetDev\0VLAN\0MACVLAN\0VXLAN\0Tunnel\0Peer\0Tun\0Tap\0Bond\0", - config_item_perf_lookup, (void*) network_netdev_gperf_lookup, - false, false, netdev); - if (r < 0) { - log_warning("Could not parse config file %s: %s", filename, strerror(-r)); + config_item_perf_lookup, network_netdev_gperf_lookup, + false, false, true, netdev); + if (r < 0) return r; - } - switch (netdev->kind) { - case _NETDEV_KIND_INVALID: - log_warning("NetDev without Kind configured in %s. Ignoring", filename); + /* skip out early if configuration does not match the environment */ + if (net_match_config(NULL, NULL, NULL, NULL, NULL, + netdev->match_host, netdev->match_virt, + netdev->match_kernel, netdev->match_arch, + NULL, NULL, NULL, NULL, NULL, NULL) <= 0) return 0; - case NETDEV_KIND_VLAN: - if (netdev->vlanid > VLANID_MAX) { - log_warning("VLAN without valid Id configured in %s. Ignoring", filename); - return 0; - } - break; - case NETDEV_KIND_VXLAN: - if (netdev->vxlanid > VXLAN_VID_MAX) { - log_warning("VXLAN without valid Id configured in %s. Ignoring", filename); - return 0; - } - break; - case NETDEV_KIND_IPIP: - case NETDEV_KIND_GRE: - case NETDEV_KIND_SIT: - case NETDEV_KIND_VTI: - if (netdev->local.in.s_addr == INADDR_ANY) { - log_warning("Tunnel without local address configured in %s. Ignoring", filename); - return 0; - } - if (netdev->remote.in.s_addr == INADDR_ANY) { - log_warning("Tunnel without remote address configured in %s. Ignoring", filename); - return 0; - } - if (netdev->family != AF_INET) { - log_warning("Tunnel with invalid address family configured in %s. Ignoring", filename); + + if (!NETDEV_VTABLE(netdev)) { + log_warning("NetDev with invalid Kind configured in %s. Ignoring", filename); + return 0; + } + + /* verify configuration */ + if (NETDEV_VTABLE(netdev)->config_verify) { + r = NETDEV_VTABLE(netdev)->config_verify(netdev, filename); + if (r < 0) return 0; - } - break; - default: - break; } if (!netdev->ifname) { @@ -646,12 +577,6 @@ static int netdev_load_one(Manager *manager, const char *filename) { if (!netdev->filename) return log_oom(); - if (net_match_config(NULL, NULL, NULL, NULL, NULL, - netdev->match_host, netdev->match_virt, - netdev->match_kernel, netdev->match_arch, - NULL, NULL, NULL, NULL, NULL, NULL) <= 0) - return 0; - if (!netdev->mac) { r = netdev_get_mac(netdev->ifname, &netdev->mac); if (r < 0) { @@ -667,50 +592,42 @@ static int netdev_load_one(Manager *manager, const char *filename) { LIST_HEAD_INIT(netdev->callbacks); - switch (netdev->kind) { - case NETDEV_KIND_VETH: - if (!netdev->ifname_peer) { - log_warning("Veth NetDev without peer name configured " - "in %s. Ignoring", filename); - return 0; - } + log_debug_netdev(netdev, "loaded %s", netdev_kind_to_string(netdev->kind)); - if (!netdev->mac) { - r = netdev_get_mac(netdev->ifname_peer, &netdev->mac_peer); - if (r < 0) { - log_error("Failed to generate predictable MAC address for %s", - netdev->ifname_peer); - return r; - } - } + /* create netdev */ + if (NETDEV_VTABLE(netdev)->fill_message_create) { + _cleanup_rtnl_message_unref_ sd_rtnl_message *m = NULL; - r = netdev_create_veth(netdev, netdev_create_handler); - if (r < 0) + r = sd_rtnl_message_new_link(netdev->manager->rtnl, &m, RTM_NEWLINK, 0); + if (r < 0) { + log_error_netdev(netdev, + "Could not allocate RTM_NEWLINK message: %s", + strerror(-r)); return r; + } - break; - case NETDEV_KIND_DUMMY: - r = netdev_create_dummy(netdev, netdev_create_handler); + r = NETDEV_VTABLE(netdev)->fill_message_create(netdev, m); if (r < 0) return r; - break; - case NETDEV_KIND_BRIDGE: - r = netdev_create(netdev); - if (r < 0) + r = sd_rtnl_call_async(netdev->manager->rtnl, m, netdev_create_handler, netdev, 0, NULL); + if (r < 0) { + log_error_netdev(netdev, + "Could not send rtnetlink message: %s", strerror(-r)); return r; - break; - case NETDEV_KIND_BOND: - r = netdev_create_bond(netdev, netdev_create_handler); + } + + netdev_ref(netdev); + + log_debug_netdev(netdev, "creating"); + + netdev->state = NETDEV_STATE_CREATING; + } else if (NETDEV_VTABLE(netdev)->create) { + r = NETDEV_VTABLE(netdev)->create(netdev); if (r < 0) return r; - break; - default: - break; } - log_debug_netdev(netdev, "loaded %s", netdev_kind_to_string(netdev->kind)); - netdev = NULL; return 0;