TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-05-06 15:46:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

cmd/tailscaled: rename isUserspace to useNetstack

Browse Source 
The bool was already called useNetstack at the caller.
isUserspace (to mean netstack) is confusing next to wgengine.NewUserspaceEngine, as that's
a different type of 'userspace'.

Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com>
This commit is contained in:
Brad Fitzpatrick 2021-04-01 08:07:54 -07:00
parent 34d4943357
commit 39b9ab3522
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
cmd/tailscaled/tailscaled.go
View File

@ -312,16 +312,16 @@ func run() error {
return nil return nil
} }
func createEngine(logf logger.Logf, linkMon *monitor.Mon) (e wgengine.Engine, isUserspace bool, err error) { func createEngine(logf logger.Logf, linkMon *monitor.Mon) (e wgengine.Engine, useNetstack bool, err error) {
if args.tunname == "" { if args.tunname == "" {
return nil, false, errors.New("no --tun value specified") return nil, false, errors.New("no --tun value specified")
} }
var errs []error var errs []error
for _, name := range strings.Split(args.tunname, ",") { for _, name := range strings.Split(args.tunname, ",") {
logf("wgengine.NewUserspaceEngine(tun %q) ...", name) logf("wgengine.NewUserspaceEngine(tun %q) ...", name)
e, isUserspace, err = tryEngine(logf, linkMon, name) e, useNetstack, err = tryEngine(logf, linkMon, name)
if err == nil { if err == nil {
return e, isUserspace, nil return e, useNetstack, nil
} }
logf("wgengine.NewUserspaceEngine(tun %q) error: %v", name, err) logf("wgengine.NewUserspaceEngine(tun %q) error: %v", name, err)
errs = append(errs, err) errs = append(errs, err)
@ -329,13 +329,13 @@ func createEngine(logf logger.Logf, linkMon *monitor.Mon) (e wgengine.Engine, is
return nil, false, multierror.New(errs) return nil, false, multierror.New(errs)
} }
func tryEngine(logf logger.Logf, linkMon *monitor.Mon, name string) (e wgengine.Engine, isUserspace bool, err error) { func tryEngine(logf logger.Logf, linkMon *monitor.Mon, name string) (e wgengine.Engine, useNetstack bool, err error) {
conf := wgengine.Config{ conf := wgengine.Config{
ListenPort: args.port, ListenPort: args.port,
LinkMonitor: linkMon, LinkMonitor: linkMon,
} }
isUserspace = name == "userspace-networking" useNetstack = name == "userspace-networking"
if !isUserspace { if !useNetstack {
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)
@ -351,9 +351,9 @@ func tryEngine(logf logger.Logf, linkMon *monitor.Mon, name string) (e wgengine.
} }
e, err = wgengine.NewUserspaceEngine(logf, conf) e, err = wgengine.NewUserspaceEngine(logf, conf)
if err != nil { if err != nil {
return nil, isUserspace, err return nil, useNetstack, err
} }
return e, isUserspace, nil return e, useNetstack, nil
} }
func newDebugMux() *http.ServeMux { func newDebugMux() *http.ServeMux {