From 698ebe228738ba40aac5101750e55cadd3c9030c Mon Sep 17 00:00:00 2001
From: mlsmaycon <mlsmaycon@gmail.com>
Date: Sun, 6 Jun 2021 23:59:19 +0200
Subject: [PATCH] Removed elevate for now

---
 iface/iface.go         |  2 +-
 iface/iface_unix.go    |  6 ------
 iface/iface_windows.go | 17 -----------------
 3 files changed, 1 insertion(+), 24 deletions(-)

diff --git a/iface/iface.go b/iface/iface.go
index 3f5763f0b1b..5b491ccebbe 100644
--- a/iface/iface.go
+++ b/iface/iface.go
@@ -22,7 +22,7 @@ var tunIface tun.Device
 // Will reuse an existing one.
 func Create(iface string, address string) error {
 	var err error
-	tunIface, err = createIface(iface, defaultMTU)
+	tunIface, err = tun.CreateTUN(iface, defaultMTU)
 	if err != nil {
 		return err
 	}
diff --git a/iface/iface_unix.go b/iface/iface_unix.go
index 7285dbec060..ccdfa69cff8 100644
--- a/iface/iface_unix.go
+++ b/iface/iface_unix.go
@@ -4,15 +4,9 @@ package iface
 
 import (
 	"golang.zx2c4.com/wireguard/ipc"
-	"golang.zx2c4.com/wireguard/tun"
 	"net"
 )
 
-// createIface creates a tun device
-func createIface(iface string, defaultMTU int) (tun.Device, error) {
-	return tun.CreateTUN(iface, defaultMTU)
-}
-
 // getUAPI returns a Listener
 func getUAPI(iface string) (net.Listener, error) {
 	tunSock, err := ipc.UAPIOpen(iface)
diff --git a/iface/iface_windows.go b/iface/iface_windows.go
index 56089be77c5..9ce7aeafebb 100644
--- a/iface/iface_windows.go
+++ b/iface/iface_windows.go
@@ -4,7 +4,6 @@ import (
 	log "github.com/sirupsen/logrus"
 	"golang.zx2c4.com/wireguard/ipc"
 	"golang.zx2c4.com/wireguard/tun"
-	"golang.zx2c4.com/wireguard/windows/elevate"
 	"golang.zx2c4.com/wireguard/windows/tunnel/winipcfg"
 	"net"
 )
@@ -31,22 +30,6 @@ func assignAddr(address string, tunDevice tun.Device) error {
 	return nil
 }
 
-// createIface creates a tun device
-func createIface(iface string, defaultMTU int) (tun.Device, error) {
-
-	var tunDevice tun.Device
-	err := elevate.DoAsSystem(func() error {
-		var err error
-		tunDevice, err = tun.CreateTUN(iface, defaultMTU)
-		return err
-	})
-	if err != nil {
-		log.Errorln("Failed to create the tunnel device: ", err)
-		return nil, err
-	}
-	return tunDevice, err
-}
-
 // getUAPI returns a Listener
 func getUAPI(iface string) (net.Listener, error) {
 	return ipc.UAPIListen(iface)