TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-12-03 10:31:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

wgengine: unify NewUserspaceEngine, NewUserspaceEngineAdvanced

Browse Source 
Also rename EngineConfig to Config to avoid wgengine.EngineConfig
stutter.

Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com>
This commit is contained in:
Brad Fitzpatrick
2021-02-27 21:42:34 -08:00
parent dda03a911e
commit ee6475a44d
4 changed files with 84 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
cmd/tailscaled/tailscaled.go
View File

@@ -198,7 +198,10 @@ func run() error {
}
e, err = wgengine.NewFakeUserspaceEngine(logf, 0, impl)
} else {
e, err = wgengine.NewUserspaceEngine(logf, args.tunname, args.port)
e, err = wgengine.NewUserspaceEngine(logf, wgengine.Config{
TUNName: args.tunname,
ListenPort: args.port,
})
}
if err != nil {
logf("wgengine.New: %v", err)

5
cmd/tailscaled/tailscaled_windows.go
View File

@@ -114,7 +114,10 @@ func startIPNServer(ctx context.Context, logid string) error {
var err error
getEngine := func() (wgengine.Engine, error) {
eng, err := wgengine.NewUserspaceEngine(logf, "Tailscale", 41641)
eng, err := wgengine.NewUserspaceEngine(logf, wgengine.Config{
TUNName: "Tailscale",
ListenPort: 41641,
})
if err != nil {
return nil, err
}