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=eaa8bede7a55b7162fae513d9a26aea3ded6d0cc;hp=20917e334b3092513048b79eed30d7af58fa0549;hb=ad0774e61e436d052f93549fc7fd367ade069286;hpb=8900367cd26c148200b4788cd9ae05995ceeb74c diff --git a/src/network/networkd-netdev.c b/src/network/networkd-netdev.c index 20917e334..eaa8bede7 100644 --- a/src/network/networkd-netdev.c +++ b/src/network/networkd-netdev.c @@ -29,8 +29,6 @@ #include "list.h" #include "siphash24.h" -#define VLANID_MAX 4094 - static const char* const netdev_kind_table[_NETDEV_KIND_MAX] = { [NETDEV_KIND_BRIDGE] = "bridge", [NETDEV_KIND_BOND] = "bond", @@ -41,22 +39,13 @@ static const char* const netdev_kind_table[_NETDEV_KIND_MAX] = { [NETDEV_KIND_GRE] = "gre", [NETDEV_KIND_SIT] = "sit", [NETDEV_KIND_VETH] = "veth", - [NETDEV_KIND_VTI] = "vti" + [NETDEV_KIND_VTI] = "vti", + [NETDEV_KIND_DUMMY] = "dummy", }; 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[_NETDEV_MACVLAN_MODE_MAX] = { - [NETDEV_MACVLAN_MODE_PRIVATE] = "private", - [NETDEV_MACVLAN_MODE_VEPA] = "vepa", - [NETDEV_MACVLAN_MODE_BRIDGE] = "bridge", - [NETDEV_MACVLAN_MODE_PASSTHRU] = "passthru", -}; - -DEFINE_STRING_TABLE_LOOKUP(macvlan_mode, MacVlanMode); -DEFINE_CONFIG_PARSE_ENUM(config_parse_macvlan_mode, macvlan_mode, MacVlanMode, "Failed to parse macvlan mode"); - static void netdev_cancel_callbacks(NetDev *netdev) { _cleanup_rtnl_message_unref_ sd_rtnl_message *m = NULL; netdev_enslave_callback *callback; @@ -195,13 +184,16 @@ static int netdev_enslave_ready(NetDev *netdev, Link* link, sd_rtnl_message_hand return r; } + link_ref(link); + log_debug_netdev(netdev, "enslaving link '%s'", link->ifname); return 0; } static int netdev_enter_ready(NetDev *netdev) { - netdev_enslave_callback *callback; + netdev_enslave_callback *callback, *callback_next; + int r; assert(netdev); assert(netdev->ifname); @@ -213,10 +205,16 @@ static int netdev_enter_ready(NetDev *netdev) { log_info_netdev(netdev, "netdev ready"); - LIST_FOREACH(callbacks, callback, netdev->callbacks) { + LIST_FOREACH_SAFE(callbacks, callback, callback_next, netdev->callbacks) { /* enslave the links that were attempted to be enslaved before the * link was ready */ - netdev_enslave_ready(netdev, callback->link, callback->callback); + r = netdev_enslave_ready(netdev, callback->link, callback->callback); + if (r < 0) + return r; + + LIST_REMOVE(callbacks, netdev->callbacks, callback); + link_unref(callback->link); + free(callback); } return 0; @@ -270,14 +268,12 @@ int config_parse_tunnel_address(const char *unit, return 0; } -static int netdev_create(NetDev *netdev, Link *link, sd_rtnl_message_handler_t callback) { +static int netdev_create(NetDev *netdev) { _cleanup_rtnl_message_unref_ sd_rtnl_message *req = NULL; const char *kind; int r; assert(netdev); - assert(!(netdev->kind == NETDEV_KIND_VLAN || netdev->kind == NETDEV_KIND_MACVLAN) || - (link && callback)); assert(netdev->ifname); assert(netdev->manager); assert(netdev->manager->rtnl); @@ -290,16 +286,6 @@ static int netdev_create(NetDev *netdev, Link *link, sd_rtnl_message_handler_t c return r; } - if (link) { - r = sd_rtnl_message_append_u32(req, IFLA_LINK, link->ifindex); - if (r < 0) { - log_error_netdev(netdev, - "Could not append IFLA_LINK attribute: %s", - strerror(-r)); - return r; - } - } - r = sd_rtnl_message_append_string(req, IFLA_IFNAME, netdev->ifname); if (r < 0) { log_error_netdev(netdev, @@ -350,26 +336,6 @@ static int netdev_create(NetDev *netdev, Link *link, sd_rtnl_message_handler_t c 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, @@ -386,18 +352,15 @@ static int netdev_create(NetDev *netdev, Link *link, sd_rtnl_message_handler_t c return r; } - if (link) - r = sd_rtnl_call_async(netdev->manager->rtnl, req, callback, link, 0, NULL); - else { - r = sd_rtnl_call_async(netdev->manager->rtnl, req, &netdev_create_handler, netdev, 0, NULL); - - netdev_ref(netdev); - } if (r < 0) { + 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; } + netdev_ref(netdev); + log_debug_netdev(netdev, "creating netdev"); netdev->state = NETDEV_STATE_CREATING; @@ -411,8 +374,9 @@ int netdev_enslave(NetDev *netdev, Link *link, sd_rtnl_message_handler_t callbac switch(netdev->kind) { case NETDEV_KIND_VLAN: + return netdev_create_vlan(netdev, link, callback); case NETDEV_KIND_MACVLAN: - return netdev_create(netdev, link, callback); + return netdev_create_macvlan(netdev, link, callback); case NETDEV_KIND_VXLAN: return netdev_create_vxlan(netdev, link, callback); case NETDEV_KIND_IPIP: @@ -438,6 +402,7 @@ int netdev_enslave(NetDev *netdev, Link *link, sd_rtnl_message_handler_t callbac cb->callback = callback; cb->link = link; + link_ref(link); LIST_PREPEND(callbacks, netdev->callbacks, cb); } @@ -717,10 +682,16 @@ static int netdev_load_one(Manager *manager, const char *filename) { if (r < 0) return r; + break; + case NETDEV_KIND_DUMMY: + r = netdev_create_dummy(netdev, netdev_create_handler); + if (r < 0) + return r; + break; case NETDEV_KIND_BRIDGE: case NETDEV_KIND_BOND: - r = netdev_create(netdev, NULL, NULL); + r = netdev_create(netdev); if (r < 0) return r; break;