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

net/tstun: rename TUN to Wrapper.

Browse Source 
The tstun packagen contains both constructors for generic tun
Devices, and a wrapper that provides additional functionality.

Signed-off-by: David Anderson <danderson@tailscale.com>
This commit is contained in:
David Anderson
2021-03-26 23:13:20 -07:00
parent 82ab7972f4
commit 016de16b2e
7 changed files with 58 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
net/tstun/wrap_test.go
View File

@ -106,7 +106,7 @@ func netports(netPorts ...string) (ret []filter.NetPortRange) {
return ret
}
func setfilter(logf logger.Logf, tun *TUN) {
func setfilter(logf logger.Logf, tun *Wrapper) {
protos := []ipproto.Proto{
ipproto.TCP,
ipproto.UDP,
@ -120,9 +120,9 @@ func setfilter(logf logger.Logf, tun *TUN) {
tun.SetFilter(filter.New(matches, sb.IPSet(), sb.IPSet(), nil, logf))
}
func newChannelTUN(logf logger.Logf, secure bool) (*tuntest.ChannelTUN, *TUN) {
func newChannelTUN(logf logger.Logf, secure bool) (*tuntest.ChannelTUN, *Wrapper) {
chtun := tuntest.NewChannelTUN()
tun := WrapTUN(logf, chtun.TUN())
tun := Wrap(logf, chtun.TUN())
if secure {
setfilter(logf, tun)
} else {
@ -131,9 +131,9 @@ func newChannelTUN(logf logger.Logf, secure bool) (*tuntest.ChannelTUN, *TUN) {
return chtun, tun
}
func newFakeTUN(logf logger.Logf, secure bool) (*fakeTUN, *TUN) {
func newFakeTUN(logf logger.Logf, secure bool) (*fakeTUN, *Wrapper) {
ftun := NewFake()
tun := WrapTUN(logf, ftun)
tun := Wrap(logf, ftun)
if secure {
setfilter(logf, tun)
} else {
@ -274,7 +274,7 @@ func TestFilter(t *testing.T) {
{"good_packet_out", out, false, udp4("1.2.3.4", "5.6.7.8", 98, 98)},
}
// A reader on the other end of the TUN.
// A reader on the other end of the tun.
go func() {
var recvbuf []byte
for {
@ -377,11 +377,11 @@ func BenchmarkWrite(b *testing.B) {
}
func TestAtomic64Alignment(t *testing.T) {
off := unsafe.Offsetof(TUN{}.lastActivityAtomic)
off := unsafe.Offsetof(Wrapper{}.lastActivityAtomic)
if off%8 != 0 {
t.Errorf("offset %v not 8-byte aligned", off)
}
c := new(TUN)
c := new(Wrapper)
atomic.StoreInt64(&c.lastActivityAtomic, 123)
}