diff options
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | src/network/networkd-macvlan.c | 158 | ||||
| -rw-r--r-- | src/network/networkd-netdev.c | 62 | ||||
| -rw-r--r-- | src/network/networkd-vlan.c | 147 | ||||
| -rw-r--r-- | src/network/networkd.h | 4 |
5 files changed, 319 insertions, 54 deletions
diff --git a/Makefile.am b/Makefile.am index d2edf3daaf..cc3b7fd5db 100644 --- a/Makefile.am +++ b/Makefile.am @@ -4532,6 +4532,8 @@ libsystemd_networkd_core_la_SOURCES = \ src/network/networkd-tunnel.c \ src/network/networkd-veth.c \ src/network/networkd-vxlan.c \ + src/network/networkd-vlan.c \ + src/network/networkd-macvlan.c \ src/network/networkd-dummy.c \ src/network/networkd-network.c \ src/network/networkd-address.c \ diff --git a/src/network/networkd-macvlan.c b/src/network/networkd-macvlan.c new file mode 100644 index 0000000000..9227144531 --- /dev/null +++ b/src/network/networkd-macvlan.c @@ -0,0 +1,158 @@ +/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ + +/*** + This file is part of systemd. + + Copyright 2013 Tom Gundersen <teg@jklm.no> + + systemd is free software; you can redistribute it and/or modify it + under the terms of the GNU Lesser General Public License as published by + the Free Software Foundation; either version 2.1 of the License, or + (at your option) any later version. + + systemd is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License + along with systemd; If not, see <http://www.gnu.org/licenses/>. +***/ + +#include <net/if.h> + +#include "networkd.h" +#include "network-internal.h" +#include "conf-parser.h" +#include "list.h" + +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"); + +int netdev_create_macvlan(NetDev *netdev, Link *link, sd_rtnl_message_handler_t callback) { + _cleanup_rtnl_message_unref_ sd_rtnl_message *req = NULL; + const char *kind; + int r; + + assert(netdev); + assert(netdev->kind == NETDEV_KIND_MACVLAN); + assert(link); + assert(callback); + 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; + } + + 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, + "Could not append IFLA_IFNAME attribute: %s", + strerror(-r)); + return r; + } + + 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)); + 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; + } + + 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, + "Could not close IFLA_LINKINFO container %s", + strerror(-r)); + return r; + } + + 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; + } + + log_debug_netdev(netdev, "creating netdev"); + + netdev->state = NETDEV_STATE_CREATING; + + return 0; +} diff --git a/src/network/networkd-netdev.c b/src/network/networkd-netdev.c index 2fff962b58..c80e943871 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", @@ -48,16 +46,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 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; @@ -271,14 +259,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); @@ -291,16 +277,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 +327,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 +343,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 +365,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: @@ -729,7 +683,7 @@ static int netdev_load_one(Manager *manager, const char *filename) { 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; diff --git a/src/network/networkd-vlan.c b/src/network/networkd-vlan.c new file mode 100644 index 0000000000..1d812fdcaa --- /dev/null +++ b/src/network/networkd-vlan.c @@ -0,0 +1,147 @@ +/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ + +/*** + This file is part of systemd. + + Copyright 2013 Tom Gundersen <teg@jklm.no> + + systemd is free software; you can redistribute it and/or modify it + under the terms of the GNU Lesser General Public License as published by + the Free Software Foundation; either version 2.1 of the License, or + (at your option) any later version. + + systemd is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License + along with systemd; If not, see <http://www.gnu.org/licenses/>. +***/ + +#include <net/if.h> + +#include "networkd.h" +#include "network-internal.h" +#include "list.h" + +int netdev_create_vlan(NetDev *netdev, Link *link, sd_rtnl_message_handler_t callback) { + _cleanup_rtnl_message_unref_ sd_rtnl_message *req = NULL; + const char *kind; + int r; + + assert(netdev); + assert(netdev->kind == NETDEV_KIND_VLAN); + assert(link); + assert(callback); + 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; + } + + 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, + "Could not append IFLA_IFNAME attribute: %s", + strerror(-r)); + return r; + } + + 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)); + 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; + } + + 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; + } + } + + 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, + "Could not close IFLA_LINKINFO container %s", + strerror(-r)); + return r; + } + + 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; + } + + log_debug_netdev(netdev, "creating netdev"); + + netdev->state = NETDEV_STATE_CREATING; + + return 0; +} diff --git a/src/network/networkd.h b/src/network/networkd.h index e0232af1e5..0ba9ee5880 100644 --- a/src/network/networkd.h +++ b/src/network/networkd.h @@ -339,6 +339,8 @@ DEFINE_TRIVIAL_CLEANUP_FUNC(Manager*, manager_free); /* NetDev */ +#define VLANID_MAX 4094 + int netdev_load(Manager *manager); void netdev_drop(NetDev *netdev); @@ -354,6 +356,8 @@ int netdev_enslave(NetDev *netdev, Link *link, sd_rtnl_message_handler_t cb); int netdev_create_tunnel(NetDev *netdev, Link *link, sd_rtnl_message_handler_t callback); int netdev_create_veth(NetDev *netdev, sd_rtnl_message_handler_t callback); int netdev_create_vxlan(NetDev *netdev, Link *link, sd_rtnl_message_handler_t callback); +int netdev_create_vlan(NetDev *netdev, Link *link, sd_rtnl_message_handler_t callback); +int netdev_create_macvlan(NetDev *netdev, Link *link, sd_rtnl_message_handler_t callback); int netdev_create_dummy(NetDev *netdev, sd_rtnl_message_handler_t callback); const char *netdev_kind_to_string(NetDevKind d) _const_; |