diff options
author | Tom Gundersen <teg@jklm.no> | 2014-07-01 19:45:37 +0200 |
---|---|---|
committer | Tom Gundersen <teg@jklm.no> | 2014-07-01 22:10:07 +0200 |
commit | 9e358851b470a1994287c8cb1d9eb78837faaf60 (patch) | |
tree | 016c47865e62add893cd2908e6729891378cb820 /src/network | |
parent | 4cc7a82c9490a3c5ae03b1d6d168ce40ba499e23 (diff) |
networkd: netdev - add dummy support
Diffstat (limited to 'src/network')
-rw-r--r-- | src/network/networkd-dummy.c | 120 | ||||
-rw-r--r-- | src/network/networkd-netdev.c | 11 | ||||
-rw-r--r-- | src/network/networkd.h | 2 |
3 files changed, 132 insertions, 1 deletions
diff --git a/src/network/networkd-dummy.c b/src/network/networkd-dummy.c new file mode 100644 index 0000000000..5232524df7 --- /dev/null +++ b/src/network/networkd-dummy.c @@ -0,0 +1,120 @@ +/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ + +/*** + This file is part of systemd. + + Copyright 2014 Susant Sahani <susant@redhat.com> + Copyright 2014 Tom Gundersen + + 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 <netinet/ether.h> +#include <arpa/inet.h> +#include <net/if.h> +#include <linux/veth.h> + +#include "sd-rtnl.h" +#include "networkd.h" + + +static int netdev_fill_dummy_rtnl_message(NetDev *netdev, sd_rtnl_message *m) { + int r; + + assert(netdev); + assert(m); + + r = sd_rtnl_message_append_string(m, IFLA_IFNAME, netdev->ifname); + if (r < 0) { + log_error_netdev(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_error_netdev(netdev, + "Colud not append IFLA_ADDRESS attribute: %s", + strerror(-r)); + return r; + } + } + + r = sd_rtnl_message_open_container(m, IFLA_LINKINFO); + if (r < 0) { + log_error_netdev(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_error_netdev(netdev, + "Could not append IFLA_INFO_DATA attribute: %s", + strerror(-r)); + return r; + } + + r = sd_rtnl_message_close_container(m); + if (r < 0) { + log_error_netdev(netdev, + "Could not append IFLA_LINKINFO attribute: %s", + strerror(-r)); + return r; + } + + return r; +} + +int netdev_create_dummy(NetDev *netdev, sd_rtnl_message_handler_t callback) { + _cleanup_rtnl_message_unref_ sd_rtnl_message *m = NULL; + int r; + + assert(netdev); + assert(netdev->ifname); + assert(netdev->manager); + assert(netdev->manager->rtnl); + + 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; + } + + if(netdev->kind != NETDEV_KIND_DUMMY) + return -ENOTSUP; + + r = netdev_fill_dummy_rtnl_message(netdev, m); + if(r < 0) + return r; + + r = sd_rtnl_call_async(netdev->manager->rtnl, m, callback, netdev, 0, NULL); + if (r < 0) { + log_error_netdev(netdev, + "Could not send rtnetlink message: %s", strerror(-r)); + return r; + } + + log_debug_netdev(netdev, "Creating dummy netdev."); + + netdev->state = NETDEV_STATE_CREATING; + + return 0; +} diff --git a/src/network/networkd-netdev.c b/src/network/networkd-netdev.c index 20917e334b..2fff962b58 100644 --- a/src/network/networkd-netdev.c +++ b/src/network/networkd-netdev.c @@ -41,7 +41,8 @@ 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); @@ -718,6 +719,14 @@ static int netdev_load_one(Manager *manager, const char *filename) { return r; break; + case NETDEV_KIND_DUMMY: + r = netdev_create_dummy(netdev, netdev_create_handler); + if (r < 0) + return r; + + netdev_ref(netdev); + + break; case NETDEV_KIND_BRIDGE: case NETDEV_KIND_BOND: r = netdev_create(netdev, NULL, NULL); diff --git a/src/network/networkd.h b/src/network/networkd.h index c2b88acd61..e0232af1e5 100644 --- a/src/network/networkd.h +++ b/src/network/networkd.h @@ -81,6 +81,7 @@ typedef enum NetDevKind { NETDEV_KIND_SIT, NETDEV_KIND_VETH, NETDEV_KIND_VTI, + NETDEV_KIND_DUMMY, _NETDEV_KIND_MAX, _NETDEV_KIND_INVALID = -1 } NetDevKind; @@ -353,6 +354,7 @@ 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_dummy(NetDev *netdev, sd_rtnl_message_handler_t callback); const char *netdev_kind_to_string(NetDevKind d) _const_; NetDevKind netdev_kind_from_string(const char *d) _pure_; |