X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fnetwork%2Fnetworkd-netdev.c;h=b75eab9cd8743bdb8631827fb38ccd426206adc6;hp=8e53439d32b534b0050975da721310f5f191bee0;hb=1372d5eff4631aeec132b8e22d243fb81a4fdbc8;hpb=e46eab86cd119b04ac14f5a2b404a614ae350016 diff --git a/src/network/networkd-netdev.c b/src/network/networkd-netdev.c index 8e53439d3..b75eab9cd 100644 --- a/src/network/networkd-netdev.c +++ b/src/network/networkd-netdev.c @@ -22,15 +22,7 @@ #include #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 "networkd-link.h" #include "network-internal.h" #include "path-util.h" #include "conf-files.h" @@ -73,7 +65,6 @@ static const char* const netdev_kind_table[_NETDEV_KIND_MAX] = { DEFINE_STRING_TABLE_LOOKUP(netdev_kind, NetDevKind); DEFINE_CONFIG_PARSE_ENUM(config_parse_netdev_kind, netdev_kind, NetDevKind, "Failed to parse netdev kind"); - static void netdev_cancel_callbacks(NetDev *netdev) { _cleanup_rtnl_message_unref_ sd_rtnl_message *m = NULL; netdev_join_callback *callback; @@ -111,17 +102,17 @@ static void netdev_free(NetDev *netdev) { free(netdev->description); free(netdev->ifname); - free(netdev->ifname_peer); free(netdev->mac); - free(netdev->mac_peer); - free(netdev->user_name); - free(netdev->group_name); condition_free_list(netdev->match_host); condition_free_list(netdev->match_virt); condition_free_list(netdev->match_kernel); condition_free_list(netdev->match_arch); + if (NETDEV_VTABLE(netdev) && + NETDEV_VTABLE(netdev)->done) + NETDEV_VTABLE(netdev)->done(netdev); + free(netdev); } @@ -145,7 +136,7 @@ void netdev_drop(NetDev *netdev) { netdev->state = NETDEV_STATE_LINGER; - log_debug_netdev(netdev, "netdev removed"); + log_netdev_debug(netdev, "netdev removed"); netdev_cancel_callbacks(netdev); @@ -193,7 +184,7 @@ static int netdev_enslave_ready(NetDev *netdev, Link* link, sd_rtnl_message_hand r = sd_rtnl_message_new_link(netdev->manager->rtnl, &req, RTM_SETLINK, link->ifindex); if (r < 0) { - log_error_netdev(netdev, + log_netdev_error(netdev, "Could not allocate RTM_SETLINK message: %s", strerror(-r)); return r; @@ -201,7 +192,7 @@ static int netdev_enslave_ready(NetDev *netdev, Link* link, sd_rtnl_message_hand r = sd_rtnl_message_append_u32(req, IFLA_MASTER, netdev->ifindex); if (r < 0) { - log_error_netdev(netdev, + log_netdev_error(netdev, "Could not append IFLA_MASTER attribute: %s", strerror(-r)); return r; @@ -209,7 +200,7 @@ static int netdev_enslave_ready(NetDev *netdev, Link* link, sd_rtnl_message_hand r = sd_rtnl_call_async(netdev->manager->rtnl, req, callback, link, 0, NULL); if (r < 0) { - log_error_netdev(netdev, + log_netdev_error(netdev, "Could not send rtnetlink message: %s", strerror(-r)); return r; @@ -217,7 +208,7 @@ static int netdev_enslave_ready(NetDev *netdev, Link* link, sd_rtnl_message_hand link_ref(link); - log_debug_netdev(netdev, "enslaving link '%s'", link->ifname); + log_netdev_debug(netdev, "enslaving link '%s'", link->ifname); return 0; } @@ -260,7 +251,7 @@ static int netdev_create_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userda r = sd_rtnl_message_get_errno(m); if (r == -EEXIST) - log_debug_netdev(netdev, "netdev exists, using existing"); + log_netdev_debug(netdev, "netdev exists, using existing"); else if (r < 0) { log_warning_netdev(netdev, "netdev could not be created: %s", strerror(-r)); netdev_drop(netdev); @@ -268,6 +259,8 @@ static int netdev_create_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userda return 1; } + log_netdev_debug(netdev, "created"); + return 1; } @@ -294,46 +287,10 @@ int netdev_enslave(NetDev *netdev, Link *link, sd_rtnl_message_handler_t callbac link_ref(link); LIST_PREPEND(callbacks, netdev->callbacks, cb); - } - - return 0; -} - -/* the callback must be called, possibly after a timeout, as otherwise the Link will hang */ -int netdev_join(NetDev *netdev, Link *link, sd_rtnl_message_handler_t callback) { - int r; - - assert(netdev); - assert(netdev->manager); - assert(netdev->manager->rtnl); - assert(NETDEV_VTABLE(netdev)); - - 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; - } - NETDEV_VTABLE(netdev)->fill_message_create_on_link(netdev, link, req); - - 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; - } - - 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"); + log_netdev_debug(netdev, "will enslave '%s', when reday", + link->ifname); + } return 0; } @@ -341,8 +298,8 @@ int netdev_join(NetDev *netdev, Link *link, sd_rtnl_message_handler_t callback) 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); @@ -350,29 +307,29 @@ int netdev_set_ifindex(NetDev *netdev, sd_rtnl_message *message) { r = sd_rtnl_message_get_type(message, &type); if (r < 0) { - log_error_netdev(netdev, "Could not get rtnl message type"); + log_netdev_error(netdev, "Could not get rtnl message type"); return r; } if (type != RTM_NEWLINK) { - log_error_netdev(netdev, "Can not set ifindex from unexpected rtnl message type"); + log_netdev_error(netdev, "Can not set ifindex from unexpected rtnl message type"); return -EINVAL; } r = sd_rtnl_message_link_get_ifindex(message, &ifindex); if (r < 0) { - log_error_netdev(netdev, "Could not get ifindex: %s", strerror(-r)); + log_netdev_error(netdev, "Could not get ifindex: %s", strerror(-r)); netdev_enter_failed(netdev); return r; } else if (ifindex <= 0) { - log_error_netdev(netdev, "Got invalid ifindex: %d", ifindex); + log_netdev_error(netdev, "Got invalid ifindex: %d", ifindex); netdev_enter_failed(netdev); return r; } if (netdev->ifindex > 0) { if (netdev->ifindex != ifindex) { - log_error_netdev(netdev, "Could not set ifindex to %d, already set to %d", + log_netdev_error(netdev, "Could not set ifindex to %d, already set to %d", ifindex, netdev->ifindex); netdev_enter_failed(netdev); return -EEXIST; @@ -383,12 +340,12 @@ int netdev_set_ifindex(NetDev *netdev, sd_rtnl_message *message) { r = sd_rtnl_message_read_string(message, IFLA_IFNAME, &received_name); if (r < 0) { - log_error_netdev(netdev, "Could not get IFNAME"); + log_netdev_error(netdev, "Could not get IFNAME"); return r; } if (!streq(netdev->ifname, received_name)) { - log_error_netdev(netdev, "Received newlink with wrong IFNAME %s", + log_netdev_error(netdev, "Received newlink with wrong IFNAME %s", received_name); netdev_enter_failed(netdev); return r; @@ -396,19 +353,19 @@ int netdev_set_ifindex(NetDev *netdev, sd_rtnl_message *message) { r = sd_rtnl_message_enter_container(message, IFLA_LINKINFO); if (r < 0) { - log_error_netdev(netdev, "Could not get LINKINFO"); + log_netdev_error(netdev, "Could not get LINKINFO"); return r; } r = sd_rtnl_message_read_string(message, IFLA_INFO_KIND, &received_kind); if (r < 0) { - log_error_netdev(netdev, "Could not get KIND"); + log_netdev_error(netdev, "Could not get KIND"); return r; } r = sd_rtnl_message_exit_container(message); if (r < 0) { - log_error_netdev(netdev, "Could not exit container"); + log_netdev_error(netdev, "Could not exit container"); return r; } @@ -418,14 +375,14 @@ int netdev_set_ifindex(NetDev *netdev, sd_rtnl_message *message) { else { kind = netdev_kind_to_string(netdev->kind); if (!kind) { - log_error_netdev(netdev, "Could not get kind"); + log_netdev_error(netdev, "Could not get kind"); netdev_enter_failed(netdev); return -EINVAL; } } if (!streq(kind, received_kind)) { - log_error_netdev(netdev, + log_netdev_error(netdev, "Received newlink with wrong KIND %s, " "expected %s", received_kind, kind); netdev_enter_failed(netdev); @@ -434,7 +391,7 @@ int netdev_set_ifindex(NetDev *netdev, sd_rtnl_message *message) { netdev->ifindex = ifindex; - log_debug_netdev(netdev, "netdev has index %d", netdev->ifindex); + log_netdev_debug(netdev, "netdev has index %d", netdev->ifindex); netdev_enter_ready(netdev); @@ -487,8 +444,176 @@ int netdev_get_mac(const char *ifname, struct ether_addr **ret) { return 0; } +static int netdev_create(NetDev *netdev, Link *link, + sd_rtnl_message_handler_t callback) { + int r; + + assert(netdev); + assert(!link || callback); + + /* create netdev */ + if (NETDEV_VTABLE(netdev)->create) { + assert(!link); + + r = NETDEV_VTABLE(netdev)->create(netdev); + if (r < 0) + return r; + + log_netdev_debug(netdev, "created"); + } else { + _cleanup_rtnl_message_unref_ sd_rtnl_message *m = NULL; + + r = sd_rtnl_message_new_link(netdev->manager->rtnl, &m, RTM_NEWLINK, 0); + if (r < 0) { + log_netdev_error(netdev, + "Could not allocate RTM_NEWLINK message: %s", + strerror(-r)); + return r; + } + + r = sd_rtnl_message_append_string(m, IFLA_IFNAME, netdev->ifname); + if (r < 0) { + log_netdev_error(netdev, + "Could not append IFLA_IFNAME, attribute: %s", + strerror(-r)); + return r; + } + + if (netdev->mac) { + r = sd_rtnl_message_append_ether_addr(m, IFLA_ADDRESS, netdev->mac); + if (r < 0) { + log_netdev_error(netdev, + "Could not append IFLA_ADDRESS attribute: %s", + strerror(-r)); + return r; + } + } + + if (netdev->mtu) { + r = sd_rtnl_message_append_u32(m, IFLA_MTU, netdev->mtu); + if (r < 0) { + log_netdev_error(netdev, + "Could not append IFLA_MTU attribute: %s", + strerror(-r)); + return r; + } + } + + if (link) { + r = sd_rtnl_message_append_u32(m, IFLA_LINK, link->ifindex); + if (r < 0) { + log_netdev_error(netdev, + "Could not append IFLA_LINK attribute: %s", + strerror(-r)); + return r; + } + } + + r = sd_rtnl_message_open_container(m, IFLA_LINKINFO); + if (r < 0) { + log_netdev_error(netdev, + "Could not append IFLA_LINKINFO attribute: %s", + strerror(-r)); + return r; + } + + r = sd_rtnl_message_open_container_union(m, IFLA_INFO_DATA, + netdev_kind_to_string(netdev->kind)); + if (r < 0) { + log_netdev_error(netdev, + "Could not append IFLA_INFO_DATA attribute: %s", + strerror(-r)); + return r; + } + + if (NETDEV_VTABLE(netdev)->fill_message_create) { + r = NETDEV_VTABLE(netdev)->fill_message_create(netdev, link, m); + if (r < 0) + return r; + } + + r = sd_rtnl_message_close_container(m); + if (r < 0) { + log_netdev_error(netdev, + "Could not append IFLA_LINKINFO attribute: %s", + strerror(-r)); + return r; + } + + r = sd_rtnl_message_close_container(m); + if (r < 0) { + log_netdev_error(netdev, + "Could not append IFLA_LINKINFO attribute: %s", + strerror(-r)); + return r; + } + + + if (link) { + r = sd_rtnl_call_async(netdev->manager->rtnl, m, + callback, link, 0, NULL); + if (r < 0) { + log_netdev_error(netdev, + "Could not send rtnetlink message: %s", + strerror(-r)); + return r; + } + + link_ref(link); + } else { + r = sd_rtnl_call_async(netdev->manager->rtnl, m, + netdev_create_handler, netdev, 0, + NULL); + if (r < 0) { + log_netdev_error(netdev, + "Could not send rtnetlink message: %s", + strerror(-r)); + return r; + } + + netdev_ref(netdev); + } + + netdev->state = NETDEV_STATE_CREATING; + + log_netdev_debug(netdev, "creating"); + } + + return 0; +} + +/* the callback must be called, possibly after a timeout, as otherwise the Link will hang */ +int netdev_join(NetDev *netdev, Link *link, sd_rtnl_message_handler_t callback) { + int r; + + assert(netdev); + assert(netdev->manager); + assert(netdev->manager->rtnl); + assert(NETDEV_VTABLE(netdev)); + + switch (NETDEV_VTABLE(netdev)->create_type) { + case NETDEV_CREATE_MASTER: + r = netdev_enslave(netdev, link, callback); + if (r < 0) + return r; + + break; + case NETDEV_CREATE_STACKED: + r = netdev_create(netdev, link, callback); + if (r < 0) + return r; + + break; + default: + assert_not_reached("Can not join independent netdev"); + } + + return 0; +} + static int netdev_load_one(Manager *manager, const char *filename) { _cleanup_netdev_unref_ NetDev *netdev = NULL; + _cleanup_free_ NetDev *netdev_raw = NULL; _cleanup_fclose_ FILE *file = NULL; int r; @@ -508,69 +633,65 @@ static int netdev_load_one(Manager *manager, const char *filename) { return 0; } - netdev = new0(NetDev, 1); - if (!netdev) + netdev_raw = new0(NetDev, 1); + if (!netdev_raw) return log_oom(); - netdev->n_ref = 1; - netdev->manager = manager; - netdev->state = _NETDEV_STATE_INVALID; - netdev->kind = _NETDEV_KIND_INVALID; - netdev->macvlan_mode = _NETDEV_MACVLAN_MODE_INVALID; - netdev->bond_mode = _NETDEV_BOND_MODE_INVALID; - netdev->vlanid = VLANID_MAX + 1; - netdev->vxlanid = VXLAN_VID_MAX + 1; - netdev->tunnel_pmtudisc = true; - netdev->learning = true; + netdev_raw->kind = _NETDEV_KIND_INVALID; r = config_parse(NULL, filename, file, - "Match\0NetDev\0VLAN\0MACVLAN\0VXLAN\0Tunnel\0Peer\0Tun\0Tap\0Bond\0", + "Match\0NetDev\0", config_item_perf_lookup, network_netdev_gperf_lookup, - false, false, true, netdev); + true, false, true, netdev_raw); if (r < 0) return r; + r = fseek(file, 0, SEEK_SET); + if (r < 0) + return -errno; + /* 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, + netdev_raw->match_host, netdev_raw->match_virt, + netdev_raw->match_kernel, netdev_raw->match_arch, NULL, NULL, NULL, NULL, NULL, NULL) <= 0) return 0; - if (!NETDEV_VTABLE(netdev)) { + if (!NETDEV_VTABLE(netdev_raw)) { 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; - } - - if (!netdev->ifname) { + if (!netdev_raw->ifname) { log_warning("NetDev without Name configured in %s. Ignoring", filename); return 0; } - if (netdev->kind != NETDEV_KIND_VLAN && netdev->vlanid <= VLANID_MAX) { - log_warning("VLAN Id configured for a %s in %s. Ignoring", - netdev_kind_to_string(netdev->kind), filename); - return 0; - } + netdev = malloc0(NETDEV_VTABLE(netdev_raw)->object_size); + if (!netdev) + return log_oom(); - if (netdev->kind != NETDEV_KIND_VXLAN && netdev->vxlanid <= VXLAN_VID_MAX) { - log_warning("VXLAN Id configured for a %s in %s. Ignoring", - netdev_kind_to_string(netdev->kind), filename); - return 0; - } + netdev->n_ref = 1; + netdev->manager = manager; + netdev->state = _NETDEV_STATE_INVALID; + netdev->kind = netdev_raw->kind; + netdev->ifname = netdev_raw->ifname; - if (netdev->kind != NETDEV_KIND_MACVLAN && - netdev->macvlan_mode != _NETDEV_MACVLAN_MODE_INVALID) { - log_warning("MACVLAN Mode configured for a %s in %s. Ignoring", - netdev_kind_to_string(netdev->kind), filename); - return 0; + if (NETDEV_VTABLE(netdev)->init) + NETDEV_VTABLE(netdev)->init(netdev); + + r = config_parse(NULL, filename, file, + NETDEV_VTABLE(netdev)->sections, + config_item_perf_lookup, network_netdev_gperf_lookup, + false, false, false, netdev); + if (r < 0) + return r; + + /* verify configuration */ + if (NETDEV_VTABLE(netdev)->config_verify) { + r = NETDEV_VTABLE(netdev)->config_verify(netdev, filename); + if (r < 0) + return 0; } netdev->filename = strdup(filename); @@ -592,40 +713,18 @@ static int netdev_load_one(Manager *manager, const char *filename) { LIST_HEAD_INIT(netdev->callbacks); - log_debug_netdev(netdev, "loaded %s", netdev_kind_to_string(netdev->kind)); + log_netdev_debug(netdev, "loaded %s", netdev_kind_to_string(netdev->kind)); - /* create netdev */ - if (NETDEV_VTABLE(netdev)->fill_message_create) { - _cleanup_rtnl_message_unref_ sd_rtnl_message *m = NULL; - - 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; - } - - r = NETDEV_VTABLE(netdev)->fill_message_create(netdev, m); + switch (NETDEV_VTABLE(netdev)->create_type) { + case NETDEV_CREATE_MASTER: + case NETDEV_CREATE_INDEPENDENT: + r = netdev_create(netdev, NULL, NULL); if (r < 0) - return r; - - 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; - } - - netdev_ref(netdev); - - log_debug_netdev(netdev, "creating"); + return 0; - 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; } netdev = NULL; @@ -644,10 +743,8 @@ int netdev_load(Manager *manager) { netdev_unref(netdev); r = conf_files_list_strv(&files, ".netdev", NULL, network_dirs); - if (r < 0) { - log_error("Failed to enumerate netdev files: %s", strerror(-r)); - return r; - } + if (r < 0) + return log_error_errno(r, "Failed to enumerate netdev files: %m"); STRV_FOREACH_BACKWARDS(f, files) { r = netdev_load_one(manager, *f);