TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-03-29 12:32:24 +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
Show Stats 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" "time"
"github.com/go-multierror/multierror" "github.com/go-multierror/multierror"
"github.com/tailscale/wireguard-go/tun"
"tailscale.com/ipn/ipnserver" "tailscale.com/ipn/ipnserver"
"tailscale.com/logpolicy" "tailscale.com/logpolicy"
"tailscale.com/net/socks5" "tailscale.com/net/socks5"
@ -332,18 +333,19 @@ func tryEngine(logf logger.Logf, linkMon *monitor.Mon, name string) (e wgengine.
LinkMonitor: linkMon, LinkMonitor: linkMon,
} }
isUserspace = name == "userspace-networking" isUserspace = name == "userspace-networking"
var dev tun.Device
if isUserspace { if isUserspace {
conf.TUN = tstun.NewFake() dev = tstun.NewFake()
conf.Router = router.NewFake(logf) conf.Router = router.NewFake(logf)
} else { } else {
dev, err := tstun.New(logf, name) dev, err = tstun.New(logf, name)
if err != nil { if err != nil {
tstun.Diagnose(logf, name) tstun.Diagnose(logf, name)
return nil, false, err return nil, false, err
} }
conf.TUN = dev conf.TUN = dev
} }
e, err = wgengine.NewUserspaceEngine(logf, conf) e, err = wgengine.NewUserspaceEngine(logf, dev, conf)
if err != nil { if err != nil {
return nil, isUserspace, err 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 { if err != nil {
return nil, err return nil, err
} }
eng, err := wgengine.NewUserspaceEngine(logf, wgengine.Config{ eng, err := wgengine.NewUserspaceEngine(logf, dev, wgengine.Config{
TUN: dev,
ListenPort: 41641, ListenPort: 41641,
}) })
if err != nil { if err != nil {

13
wgengine/userspace.go
View File

@ -155,8 +155,7 @@ type Config struct {
func NewFakeUserspaceEngine(logf logger.Logf, listenPort uint16) (Engine, error) { func NewFakeUserspaceEngine(logf logger.Logf, listenPort uint16) (Engine, error) {
logf("Starting userspace wireguard engine (with fake TUN device)") logf("Starting userspace wireguard engine (with fake TUN device)")
return NewUserspaceEngine(logf, Config{ return NewUserspaceEngine(logf, tstun.NewFake(), Config{
TUN: tstun.NewFake(),
Router: router.NewFake(logf), Router: router.NewFake(logf),
ListenPort: listenPort, ListenPort: listenPort,
Fake: true, Fake: true,
@ -165,18 +164,14 @@ func NewFakeUserspaceEngine(logf logger.Logf, listenPort uint16) (Engine, error)
// NewUserspaceEngine creates the named tun device and returns a // NewUserspaceEngine creates the named tun device and returns a
// Tailscale Engine running on it. // Tailscale Engine running on it.
func NewUserspaceEngine(logf logger.Logf, conf Config) (_ Engine, reterr error) { func NewUserspaceEngine(logf logger.Logf, dev tun.Device, conf Config) (_ Engine, reterr error) {
if conf.TUN == nil {
return nil, errors.New("TUN is required")
}
var closePool closeOnErrorPool var closePool closeOnErrorPool
defer closePool.closeAllIfError(&reterr) defer closePool.closeAllIfError(&reterr)
// TODO: default to a no-op router, require caller to pass in // TODO: default to a no-op router, require caller to pass in
// effectful ones. // effectful ones.
if conf.Router == nil { if conf.Router == nil {
r, err := router.New(logf, conf.TUN) r, err := router.New(logf, dev)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -184,7 +179,7 @@ func NewUserspaceEngine(logf logger.Logf, conf Config) (_ Engine, reterr error)
closePool.add(r) closePool.add(r)
} }
tsTUNDev := tstun.Wrap(logf, conf.TUN) tsTUNDev := tstun.Wrap(logf, dev)
closePool.add(tsTUNDev) closePool.add(tsTUNDev)
e := &userspaceEngine{ e := &userspaceEngine{