TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2024-11-29 13:05:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

net/tstun: rename NewFakeTUN to NewFake.

Browse Source 
Signed-off-by: David Anderson <danderson@tailscale.com>
This commit is contained in:
David Anderson 2021-03-26 22:46:37 -07:00
parent 588b70f468
commit 82ab7972f4
4 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/tailscaled/tailscaled.go
View File

@ -333,7 +333,7 @@ func tryEngine(logf logger.Logf, linkMon *monitor.Mon, name string) (e wgengine.
} }
isUserspace = name == "userspace-networking" isUserspace = name == "userspace-networking"
if isUserspace { if isUserspace {
conf.TUN = tstun.NewFakeTUN() conf.TUN = 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)

6
net/tstun/fake.go
View File

@ -16,10 +16,8 @@ type fakeTUN struct {
closechan chan struct{} closechan chan struct{}
} }
// NewFakeTUN returns a fake TUN device that does not depend on the // NewFake returns a tun.Device that does nothing.
// operating system or any special permissions. func NewFake() tun.Device {
// It primarily exists for testing.
func NewFakeTUN() tun.Device {
return &fakeTUN{ return &fakeTUN{
evchan: make(chan tun.Event), evchan: make(chan tun.Event),
closechan: make(chan struct{}), closechan: make(chan struct{}),

2
net/tstun/wrap_test.go
View File

@ -132,7 +132,7 @@ func newChannelTUN(logf logger.Logf, secure bool) (*tuntest.ChannelTUN, *TUN) {
} }
func newFakeTUN(logf logger.Logf, secure bool) (*fakeTUN, *TUN) { func newFakeTUN(logf logger.Logf, secure bool) (*fakeTUN, *TUN) {
ftun := NewFakeTUN() ftun := NewFake()
tun := WrapTUN(logf, ftun) tun := WrapTUN(logf, ftun)
if secure { if secure {
setfilter(logf, tun) setfilter(logf, tun)

2
wgengine/userspace.go
View File

@ -156,7 +156,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, Config{
TUN: tstun.NewFakeTUN(), TUN: tstun.NewFake(),
Router: router.NewFake(logf), Router: router.NewFake(logf),
ListenPort: listenPort, ListenPort: listenPort,
Fake: true, Fake: true,