From 9e358851b470a1994287c8cb1d9eb78837faaf60 Mon Sep 17 00:00:00 2001 From: Tom Gundersen Date: Tue, 1 Jul 2014 19:45:37 +0200 Subject: networkd: netdev - add dummy support --- Makefile.am | 1 + TODO | 1 - man/systemd.netdev.xml | 12 +++- src/libsystemd/sd-rtnl/rtnl-types.c | 2 + src/network/networkd-dummy.c | 120 ++++++++++++++++++++++++++++++++++++ src/network/networkd-netdev.c | 11 +++- src/network/networkd.h | 2 + 7 files changed, 145 insertions(+), 4 deletions(-) create mode 100644 src/network/networkd-dummy.c diff --git a/Makefile.am b/Makefile.am index 783f5fe188..092153b567 100644 --- a/Makefile.am +++ b/Makefile.am @@ -4518,6 +4518,7 @@ libsystemd_networkd_core_la_SOURCES = \ src/network/networkd-tunnel.c \ src/network/networkd-veth.c \ src/network/networkd-vxlan.c \ + src/network/networkd-dummy.c \ src/network/networkd-network.c \ src/network/networkd-address.c \ src/network/networkd-route.c \ diff --git a/TODO b/TODO index 9fcbb6977a..983479b793 100644 --- a/TODO +++ b/TODO @@ -621,7 +621,6 @@ Features: - properly handle routerless dhcp leases - add veth netdev support (c.f. http://shorewall.net/bridge-Shorewall-perl.html#veth) - add tun/tap netdev support - - add dummy netdev support - add more attribute support for SIT tunnel - make metric of routes configurable - work with non-ethernet devices diff --git a/man/systemd.netdev.xml b/man/systemd.netdev.xml index 48c6e726d3..5d033e77d3 100644 --- a/man/systemd.netdev.xml +++ b/man/systemd.netdev.xml @@ -163,8 +163,8 @@ macvlan, vxlan, ipip, gre, sit, vti, - veth are supported. This option - is compulsory. + veth, and dummy + are supported. This option is compulsory. @@ -422,6 +422,14 @@ Kind=veth Name=veth-peer + + /etc/systemd/network/dummy.netdev + [NetDev] +Name=dummy-test +Kind=dummy +MACAddress=12:34:56:78:9a:bc + + See Also diff --git a/src/libsystemd/sd-rtnl/rtnl-types.c b/src/libsystemd/sd-rtnl/rtnl-types.c index d3349b21b1..9c3430d1bf 100644 --- a/src/libsystemd/sd-rtnl/rtnl-types.c +++ b/src/libsystemd/sd-rtnl/rtnl-types.c @@ -160,6 +160,7 @@ typedef enum NLUnionLinkInfoData { NL_UNION_LINK_INFO_DATA_BRIDGE, NL_UNION_LINK_INFO_DATA_VLAN, NL_UNION_LINK_INFO_DATA_VETH, + NL_UNION_LINK_INFO_DATA_DUMMY, NL_UNION_LINK_INFO_DATA_MACVLAN, NL_UNION_LINK_INFO_DATA_VXLAN, NL_UNION_LINK_INFO_DATA_IPIP_TUNNEL, @@ -179,6 +180,7 @@ static const char* const nl_union_link_info_data_table[_NL_UNION_LINK_INFO_DATA_ [NL_UNION_LINK_INFO_DATA_BRIDGE] = "bridge", [NL_UNION_LINK_INFO_DATA_VLAN] = "vlan", [NL_UNION_LINK_INFO_DATA_VETH] = "veth", + [NL_UNION_LINK_INFO_DATA_DUMMY] = "dummy", [NL_UNION_LINK_INFO_DATA_MACVLAN] = "macvlan", [NL_UNION_LINK_INFO_DATA_VXLAN] = "vxlan", [NL_UNION_LINK_INFO_DATA_IPIP_TUNNEL] = "ipip", 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 + 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 . +***/ + +#include +#include +#include +#include + +#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); @@ -717,6 +718,14 @@ 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; + + netdev_ref(netdev); + break; case NETDEV_KIND_BRIDGE: case NETDEV_KIND_BOND: 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_; -- cgit v1.2.3-54-g00ecf