TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-08-13 22:47:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

wgengine: make the tun.Device required at construction.

Browse Source 
Signed-off-by: David Anderson <danderson@tailscale.com>
This commit is contained in:
David Anderson
2021-03-27 00:25:22 -07:00
parent 25e0bb0a4e
commit 2df8adef9d
3 changed files with 10 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cmd/tailscaled/tailscaled.go
View File

@@ -29,6 +29,7 @@ import (
"time"
"github.com/go-multierror/multierror"
"github.com/tailscale/wireguard-go/tun"
"tailscale.com/ipn/ipnserver"
"tailscale.com/logpolicy"
"tailscale.com/net/socks5"
@@ -332,18 +333,19 @@ func tryEngine(logf logger.Logf, linkMon *monitor.Mon, name string) (e wgengine.
LinkMonitor: linkMon,
}
isUserspace = name == "userspace-networking"
var dev tun.Device
if isUserspace {
conf.TUN = tstun.NewFake()
dev = tstun.NewFake()
conf.Router = router.NewFake(logf)
} else {
dev, err := tstun.New(logf, name)
dev, err = tstun.New(logf, name)
if err != nil {
tstun.Diagnose(logf, name)
return nil, false, err
}
conf.TUN = dev
}
e, err = wgengine.NewUserspaceEngine(logf, conf)
e, err = wgengine.NewUserspaceEngine(logf, dev, conf)
if err != nil {
return nil, isUserspace, err
}

3
cmd/tailscaled/tailscaled_windows.go
View File

@@ -164,8 +164,7 @@ func startIPNServer(ctx context.Context, logid string) error {
if err != nil {
return nil, err
}
eng, err := wgengine.NewUserspaceEngine(logf, wgengine.Config{
TUN: dev,
eng, err := wgengine.NewUserspaceEngine(logf, dev, wgengine.Config{
ListenPort: 41641,
})
if err != nil {