X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fnetwork%2Fnetworkd-netdev.c;h=a8a629bd1ff2519575bf39603db325c828e75735;hb=69ceb044c891579fa1f5556e0980a046ccef19d4;hp=9f580aeab9dd8d7425e800115d4db920cbd94576;hpb=fe6b2d55bcb379d01664ed28cea40634cb6b52e3;p=elogind.git diff --git a/src/network/networkd-netdev.c b/src/network/networkd-netdev.c index 9f580aeab..a8a629bd1 100644 --- a/src/network/networkd-netdev.c +++ b/src/network/networkd-netdev.c @@ -20,7 +20,7 @@ ***/ #include "networkd.h" -#include "net-util.h" +#include "network-internal.h" #include "path-util.h" #include "conf-files.h" #include "conf-parser.h" @@ -28,7 +28,7 @@ #define VLANID_MAX 4094 -static const char* const netdev_kind_table[] = { +static const char* const netdev_kind_table[_NETDEV_KIND_MAX] = { [NETDEV_KIND_BRIDGE] = "bridge", [NETDEV_KIND_BOND] = "bond", [NETDEV_KIND_VLAN] = "vlan", @@ -38,7 +38,7 @@ static const char* const netdev_kind_table[] = { DEFINE_STRING_TABLE_LOOKUP(netdev_kind, NetDevKind); DEFINE_CONFIG_PARSE_ENUM(config_parse_netdev_kind, netdev_kind, NetDevKind, "Failed to parse netdev kind"); -static const char* const macvlan_mode_table[] = { +static const char* const macvlan_mode_table[_NETDEV_MACVLAN_MODE_MAX] = { [NETDEV_MACVLAN_MODE_PRIVATE] = "private", [NETDEV_MACVLAN_MODE_VEPA] = "vepa", [NETDEV_MACVLAN_MODE_BRIDGE] = "bridge", @@ -67,6 +67,11 @@ void netdev_free(NetDev *netdev) { free(netdev->description); free(netdev->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); + free(netdev); } @@ -141,6 +146,9 @@ static int netdev_enter_ready(NetDev *netdev) { assert(netdev); assert(netdev->name); + if (netdev->state != NETDEV_STATE_CREATING) + return 0; + netdev->state = NETDEV_STATE_READY; log_info_netdev(netdev, "netdev ready"); @@ -153,7 +161,6 @@ static int netdev_enter_ready(NetDev *netdev) { return 0; } - static int netdev_create_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) { NetDev *netdev = userdata; int r; @@ -161,7 +168,9 @@ static int netdev_create_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userda assert(netdev->state != _NETDEV_STATE_INVALID); r = sd_rtnl_message_get_errno(m); - if (r < 0) { + if (r == -EEXIST) + log_debug_netdev(netdev, "netdev exists, using existing"); + else if (r < 0) { log_warning_netdev(netdev, "netdev failed: %s", strerror(-r)); netdev_enter_failed(netdev); @@ -223,52 +232,42 @@ static int netdev_create(NetDev *netdev, Link *link, sd_rtnl_message_handler_t c return -EINVAL; } - r = sd_rtnl_message_append_string(req, IFLA_INFO_KIND, kind); + r = sd_rtnl_message_open_container_union(req, IFLA_INFO_DATA, kind); if (r < 0) { log_error_netdev(netdev, - "Could not append IFLA_INFO_KIND attribute: %s", - strerror(-r)); + "Could not open IFLA_INFO_DATA container: %s", + strerror(-r)); return r; } - if (netdev->vlanid <= VLANID_MAX || netdev->macvlan_mode != _NETDEV_MACVLAN_MODE_INVALID) { - r = sd_rtnl_message_open_container(req, IFLA_INFO_DATA); + if (netdev->vlanid <= VLANID_MAX) { + r = sd_rtnl_message_append_u16(req, IFLA_VLAN_ID, netdev->vlanid); if (r < 0) { log_error_netdev(netdev, - "Could not open IFLA_INFO_DATA container: %s", + "Could not append IFLA_VLAN_ID attribute: %s", strerror(-r)); return r; } + } - if (netdev->vlanid <= VLANID_MAX) { - r = sd_rtnl_message_append_u16(req, IFLA_VLAN_ID, netdev->vlanid); - if (r < 0) { - log_error_netdev(netdev, - "Could not append IFLA_VLAN_ID attribute: %s", - strerror(-r)); - return r; - } - } - - if (netdev->macvlan_mode != _NETDEV_MACVLAN_MODE_INVALID) { - r = sd_rtnl_message_append_u32(req, IFLA_MACVLAN_MODE, netdev->macvlan_mode); - if (r < 0) { - log_error_netdev(netdev, - "Could not append IFLA_MACVLAN_MODE attribute: %s", - strerror(-r)); - return r; - } - } - - r = sd_rtnl_message_close_container(req); - if (r < 0) { - log_error_netdev(netdev, - "Could not close IFLA_INFO_DATA container %s", - strerror(-r)); + if (netdev->macvlan_mode != _NETDEV_MACVLAN_MODE_INVALID) { + r = sd_rtnl_message_append_u32(req, IFLA_MACVLAN_MODE, netdev->macvlan_mode); + if (r < 0) { + log_error_netdev(netdev, + "Could not append IFLA_MACVLAN_MODE attribute: %s", + strerror(-r)); return r; } } + 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; + } + r = sd_rtnl_message_close_container(req); if (r < 0) { log_error_netdev(netdev, @@ -317,15 +316,93 @@ int netdev_enslave(NetDev *netdev, Link *link, sd_rtnl_message_handler_t callbac return 0; } -int netdev_set_ifindex(NetDev *netdev, int ifindex) { +int netdev_set_ifindex(NetDev *netdev, sd_rtnl_message *message) { + uint16_t type; + const char *kind; + char *received_kind; + char *received_name; + int r, ifindex; + assert(netdev); - assert(ifindex > 0); + assert(message); + + r = sd_rtnl_message_get_type(message, &type); + if (r < 0) { + log_error_netdev(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"); + 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)); + netdev_enter_failed(netdev); + return r; + } else if (ifindex <= 0) { + log_error_netdev(netdev, "Got invalid ifindex: %d", ifindex); + netdev_enter_failed(netdev); + return r; + } + if (netdev->ifindex > 0) { - if (netdev->ifindex == ifindex) - return 0; - else + if (netdev->ifindex != ifindex) { + log_error_netdev(netdev, "Could not set ifindex to %d, already set to %d", + ifindex, netdev->ifindex); + netdev_enter_failed(netdev); return -EEXIST; + } else + /* ifindex already set to the same for this netdev */ + return 0; + } + + r = sd_rtnl_message_read_string(message, IFLA_IFNAME, &received_name); + if (r < 0) { + log_error_netdev(netdev, "Could not get IFNAME"); + return r; + } + + if (!streq(netdev->name, received_name)) { + log_error_netdev(netdev, "Received newlink with wrong IFNAME %s", + received_name); + netdev_enter_failed(netdev); + return r; + } + + r = sd_rtnl_message_enter_container(message, IFLA_LINKINFO); + if (r < 0) { + log_error_netdev(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"); + return r; + } + + r = sd_rtnl_message_exit_container(message); + if (r < 0) { + log_error_netdev(netdev, "Could not exit container"); + return r; + } + + kind = netdev_kind_to_string(netdev->kind); + if (!kind) { + log_error_netdev(netdev, "Could not get kind"); + netdev_enter_failed(netdev); + return -EINVAL; + } + + if (!streq(kind, received_kind)) { + log_error_netdev(netdev, "Received newlink with wrong KIND %s, " + "expected %s", received_kind, kind); + netdev_enter_failed(netdev); + return r; } netdev->ifindex = ifindex; @@ -343,12 +420,17 @@ 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) return 0; else - return errno; + return -errno; } netdev = new0(NetDev, 1); @@ -420,6 +502,8 @@ static int netdev_load_one(Manager *manager, const char *filename) { return r; } + log_debug_netdev(netdev, "loaded %s", netdev_kind_to_string(netdev->kind)); + netdev = NULL; return 0;