X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fnetwork%2Fnetworkd-netdev.c;h=a8c1ea3b44a7e3b24f4409c66a2069298611fc46;hb=948a6f8eb42c85d2b96e9b5817fcfa29ad4752ae;hp=2fff962b58a8ae8fb24ab7c865a8046b5c126772;hpb=9e358851b470a1994287c8cb1d9eb78837faaf60;p=elogind.git diff --git a/src/network/networkd-netdev.c b/src/network/networkd-netdev.c index 2fff962b5..a8c1ea3b4 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", @@ -43,21 +41,13 @@ static const char* const netdev_kind_table[_NETDEV_KIND_MAX] = { [NETDEV_KIND_VETH] = "veth", [NETDEV_KIND_VTI] = "vti", [NETDEV_KIND_DUMMY] = "dummy", + [NETDEV_KIND_TUN] = "tun", + [NETDEV_KIND_TAP] = "tap", }; 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; @@ -98,6 +88,8 @@ static void netdev_free(NetDev *netdev) { 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); @@ -196,13 +188,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); @@ -214,10 +209,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; @@ -243,42 +244,12 @@ static int netdev_create_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userda return 1; } -int config_parse_tunnel_address(const char *unit, - const char *filename, - unsigned line, - const char *section, - unsigned section_line, - const char *lvalue, - int ltype, - const char *rvalue, - void *data, - void *userdata) { - NetDev *n = data; - unsigned char family = AF_INET; - int r; - - assert(filename); - assert(lvalue); - assert(rvalue); - assert(data); - - r = net_parse_inaddr(rvalue, &family, n); - if (r < 0) { - log_syntax(unit, LOG_ERR, filename, line, EINVAL, - "Tunnel address is invalid, ignoring assignment: %s", rvalue); - return 0; - } - 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); @@ -291,16 +262,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, @@ -351,26 +312,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, @@ -387,18 +328,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; @@ -412,8 +350,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: @@ -439,6 +378,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); } @@ -520,15 +460,21 @@ int netdev_set_ifindex(NetDev *netdev, sd_rtnl_message *message) { 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 (netdev->kind == NETDEV_KIND_TAP) + /* the kernel does not distinguish between tun and tap */ + kind = "tun"; + else { + 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, " + log_error_netdev(netdev, + "Received newlink with wrong KIND %s, " "expected %s", received_kind, kind); netdev_enter_failed(netdev); return r; @@ -625,7 +571,7 @@ static int netdev_load_one(Manager *manager, const char *filename) { netdev->learning = true; r = config_parse(NULL, filename, file, - "Match\0NetDev\0VLAN\0MACVLAN\0VXLAN\0Tunnel\0Peer\0", + "Match\0NetDev\0VLAN\0MACVLAN\0VXLAN\0Tunnel\0Peer\0Tun\0Tap\0", config_item_perf_lookup, (void*) network_netdev_gperf_lookup, false, false, netdev); if (r < 0) { @@ -633,9 +579,41 @@ static int netdev_load_one(Manager *manager, const char *filename) { return r; } - if (netdev->kind == _NETDEV_KIND_INVALID) { + switch (netdev->kind) { + case _NETDEV_KIND_INVALID: log_warning("NetDev without Kind configured in %s. Ignoring", filename); 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); + return 0; + } + break; + default: + break; } if (!netdev->ifname) { @@ -643,16 +621,6 @@ static int netdev_load_one(Manager *manager, const char *filename) { return 0; } - if (netdev->kind == NETDEV_KIND_VLAN && netdev->vlanid > VLANID_MAX) { - log_warning("VLAN without valid Id configured in %s. Ignoring", filename); - return 0; - } - - if (netdev->kind == NETDEV_KIND_VXLAN && netdev->vxlanid > VXLAN_VID_MAX) { - log_warning("VXLAN without valid Id 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); @@ -724,15 +692,21 @@ static int netdev_load_one(Manager *manager, const char *filename) { if (r < 0) return r; - netdev_ref(netdev); - 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; + + case NETDEV_KIND_TUN: + case NETDEV_KIND_TAP: + r = netdev_create_tuntap(netdev); + if (r < 0) + return r; + break; + default: break; }