diff options
author | Susant Sahani <susant@redhat.com> | 2014-07-03 13:34:11 +0530 |
---|---|---|
committer | Tom Gundersen <teg@jklm.no> | 2014-07-03 11:00:02 +0200 |
commit | 30ae9dfda3788cdfaf1b84d124dbc7feb638c77b (patch) | |
tree | 854a45b96eb6cd48b9b2caed95a1ecb23de7b2ed /src/network/networkd-netdev.c | |
parent | 866ee3682213789f85b877700457fdca05695a0e (diff) |
networkd: Introduce tun/tap device
This patch introduces TUN/TAP device creation support
to networkd.
Example conf to create a tap device:
file: tap.netdev
------------------
[NetDev]
Name=tap-test
Kind=tap
[Tap]
OneQueue=true
MultiQueue=true
PacketInfo=true
User=sus
Group=sus
------------------
Test:
1. output of ip link
tap-test: tap pi one_queue UNKNOWN_FLAGS:900 user 1000 group 1000
id:
uid=1000(sus) gid=10(wheel) groups=10(wheel),1000(sus)
context=unconfined_u:unconfined_r:unconfined_t:s0-s0:c0.c1023
Modifications:
Added:
1. file networkd-tuntap.c
3. netdev kind NETDEV_KIND_TUN and NETDEV_KIND_TAP
2. Tun and Tap Sections and config params to parse
conf and gperf conf parameters
[tomegun: tweak the 'kind' checking for received ifindex]
Diffstat (limited to 'src/network/networkd-netdev.c')
-rw-r--r-- | src/network/networkd-netdev.c | 32 |
1 files changed, 25 insertions, 7 deletions
diff --git a/src/network/networkd-netdev.c b/src/network/networkd-netdev.c index eaa8bede7a..cc85e5348b 100644 --- a/src/network/networkd-netdev.c +++ b/src/network/networkd-netdev.c @@ -41,6 +41,8 @@ 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); @@ -86,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); @@ -484,15 +488,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; @@ -589,7 +599,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) { @@ -695,6 +705,14 @@ static int netdev_load_one(Manager *manager, const char *filename) { 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; } |