mirrors/tailscale
1
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

net/tstun: rename from net/tun.

Browse Source 
We depend on wireguard-go/tun, identical leaf packages can be
confusing in code.

Signed-off-by: David Anderson <danderson@tailscale.com>
This commit is contained in:
David Anderson
2021-03-26 22:07:19 -07:00
committed by Dave Anderson
parent 2b4bfeda1a
commit 018200aeba
6 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cmd/tailscaled/tailscaled.go
View File

@ -32,7 +32,7 @@ import (
"tailscale.com/ipn/ipnserver"
"tailscale.com/logpolicy"
"tailscale.com/net/socks5"
"tailscale.com/net/tun"
ntun "tailscale.com/net/tstun"
"tailscale.com/paths"
"tailscale.com/types/flagtype"
"tailscale.com/types/logger"
@ -337,9 +337,9 @@ func tryEngine(logf logger.Logf, linkMon *monitor.Mon, name string) (e wgengine.
conf.TUN = tstun.NewFakeTUN()
conf.Router = router.NewFake(logf)
} else {
dev, err := tun.New(logf, name)
dev, err := ntun.New(logf, name)
if err != nil {
tun.Diagnose(logf, name)
ntun.Diagnose(logf, name)
return nil, false, err
}
conf.TUN = dev