extern/netbird
1
0
Fork 0
mirror of https://github.com/netbirdio/netbird.git synced 2025-06-01 23:55:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

Removed elevate for now

Browse Source
This commit is contained in:
mlsmaycon 2021-06-06 23:59:19 +02:00
parent 54235f0a77
commit 698ebe2287
3 changed files with 1 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
iface/iface.go
View File

@ -22,7 +22,7 @@ var tunIface tun.Device
// Will reuse an existing one. // Will reuse an existing one.
func Create(iface string, address string) error { func Create(iface string, address string) error {
var err error var err error
tunIface, err = createIface(iface, defaultMTU) tunIface, err = tun.CreateTUN(iface, defaultMTU)
if err != nil { if err != nil {
return err return err
} }

6
iface/iface_unix.go
View File

@ -4,15 +4,9 @@ package iface
import ( import (
"golang.zx2c4.com/wireguard/ipc" "golang.zx2c4.com/wireguard/ipc"
"golang.zx2c4.com/wireguard/tun"
"net" "net"
) )
// createIface creates a tun device
func createIface(iface string, defaultMTU int) (tun.Device, error) {
return tun.CreateTUN(iface, defaultMTU)
}
// getUAPI returns a Listener // getUAPI returns a Listener
func getUAPI(iface string) (net.Listener, error) { func getUAPI(iface string) (net.Listener, error) {
tunSock, err := ipc.UAPIOpen(iface) tunSock, err := ipc.UAPIOpen(iface)

17
iface/iface_windows.go
View File

@ -4,7 +4,6 @@ import (
log "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus"
"golang.zx2c4.com/wireguard/ipc" "golang.zx2c4.com/wireguard/ipc"
"golang.zx2c4.com/wireguard/tun" "golang.zx2c4.com/wireguard/tun"
"golang.zx2c4.com/wireguard/windows/elevate"
"golang.zx2c4.com/wireguard/windows/tunnel/winipcfg" "golang.zx2c4.com/wireguard/windows/tunnel/winipcfg"
"net" "net"
) )
@ -31,22 +30,6 @@ func assignAddr(address string, tunDevice tun.Device) error {
return nil 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 // getUAPI returns a Listener
func getUAPI(iface string) (net.Listener, error) { func getUAPI(iface string) (net.Listener, error) {
return ipc.UAPIListen(iface) return ipc.UAPIListen(iface)