From 0dd46d133544b5fa850540faa5d663cc75aeaf3d Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Wed, 29 Aug 2012 22:15:04 +0200
Subject: [PATCH] networking: add options for configuring virtual devices
 (tun/tap)

These are mainly useful for network tunnels (vpn/ipv6) and creating
bridges for virtual machines
---
 modules/tasks/network-interfaces.nix | 33 +++++++++++++++++++++++++++-
 1 file changed, 32 insertions(+), 1 deletion(-)

diff --git a/modules/tasks/network-interfaces.nix b/modules/tasks/network-interfaces.nix
index c12f9b28ca91..e534bf8cc56a 100644
--- a/modules/tasks/network-interfaces.nix
+++ b/modules/tasks/network-interfaces.nix
@@ -5,6 +5,7 @@ with pkgs.lib;
 let
 
   cfg = config.networking;
+  hasVirtuals = any (i: i.virtual) cfg.interfaces;
 
 in
 
@@ -119,6 +120,26 @@ in
           '';
         };
 
+        virtual = mkOption {
+          default = false;
+          type = types.bool;
+          description = ''
+            Whether this interface is virtual and should be created by tunctl.
+            This is mainly useful for creating bridges between a host a virtual
+            network such as VPN or a virtual machine.
+
+            Defaults to tap device, unless interface contains "tun" in its name.
+          '';
+        };
+
+        virtualOwner = mkOption {
+          default = "root";
+          type = types.uniq types.string;
+          description = ''
+            In case of a virtual device, the user who owns it.
+          '';
+        };
+
       };
 
     };
@@ -179,7 +200,7 @@ in
 
   config = {
 
-    boot.kernelModules = optional cfg.enableIPv6 "ipv6";
+    boot.kernelModules = optional cfg.enableIPv6 "ipv6" ++ optional hasVirtuals "tun";
 
     environment.systemPackages =
       [ pkgs.host
@@ -191,6 +212,7 @@ in
         pkgs.openresolv
       ]
       ++ optional (cfg.bridges != {}) pkgs.bridge_utils
+      ++ optional hasVirtuals pkgs.tunctl
       ++ optional cfg.enableIPv6 pkgs.ndisc6;
 
     security.setuidPrograms = [ "ping" "ping6" ];
@@ -206,6 +228,15 @@ in
           ''
             set +e # continue in case of errors
 
+            # Create virtual network interfaces
+            ${flip concatMapStrings cfg.interfaces (i:
+              optionalString i.virtual
+                ''
+                  echo "Creating virtual network interface ${i.name}..."
+                  ${pkgs.tunctl}/bin/tunctl -t "${i.name}" -u "${i.virtualOwner}"
+                '')
+            }
+
             # Set MAC addresses of interfaces, if desired.
             ${flip concatMapStrings cfg.interfaces (i:
               optionalString (i.macAddress != "")