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

net/tstun: instrument Wrapper with statistics gathering (#5847)

Browse Source 
If Wrapper.StatisticsEnable is enabled,
then per-connection counters are maintained.
If enabled, Wrapper.StatisticsExtract must be periodically called
otherwise there is unbounded memory growth.

Signed-off-by: Joe Tsai <joetsai@digital-static.net>
This commit is contained in:
Joe Tsai
2022-10-05 12:24:30 -07:00
committed by GitHub
parent a37ee8483f
commit 24ebf161e8
3 changed files with 58 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
net/tstun/wrap_test.go
View File

@ -9,6 +9,7 @@ import (
"encoding/binary"
"fmt"
"net/netip"
"reflect"
"strconv"
"strings"
"testing"
@ -18,8 +19,10 @@ import (
"go4.org/netipx"
"golang.zx2c4.com/wireguard/tun/tuntest"
"tailscale.com/disco"
"tailscale.com/net/flowtrack"
"tailscale.com/net/netaddr"
"tailscale.com/net/packet"
"tailscale.com/net/tunstats"
"tailscale.com/tstest"
"tailscale.com/tstime/mono"
"tailscale.com/types/ipproto"
@ -281,6 +284,11 @@ func TestWriteAndInject(t *testing.T) {
t.Errorf("%s not received", packet)
}
}
// Statistics gathering is disabled by default.
if stats := tun.StatisticsExtract(); len(stats) > 0 {
t.Errorf("tun.StatisticsExtract = %v, want {}", stats)
}
}
func TestFilter(t *testing.T) {
@ -329,12 +337,17 @@ func TestFilter(t *testing.T) {
}()
var buf [MaxPacketSize]byte
tun.StatisticsEnable(true)
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
var n int
var err error
var filtered bool
if stats := tun.StatisticsExtract(); len(stats) > 0 {
t.Errorf("tun.StatisticsExtract = %v, want {}", stats)
}
if tt.dir == in {
// Use the side effect of updating the last
// activity atomic to determine whether the
@ -364,6 +377,24 @@ func TestFilter(t *testing.T) {
t.Errorf("got accept; want drop")
}
}
got := tun.StatisticsExtract()
want := map[flowtrack.Tuple]tunstats.Counts{}
if !tt.drop {
var p packet.Parsed
p.Decode(tt.data)
switch tt.dir {
case in:
tuple := flowtrack.Tuple{Proto: ipproto.UDP, Src: p.Dst, Dst: p.Src}
want[tuple] = tunstats.Counts{RxPackets: 1, RxBytes: uint64(len(tt.data))}
case out:
tuple := flowtrack.Tuple{Proto: ipproto.UDP, Src: p.Src, Dst: p.Dst}
want[tuple] = tunstats.Counts{TxPackets: 1, TxBytes: uint64(len(tt.data))}
}
}
if !reflect.DeepEqual(got, want) {
t.Errorf("tun.StatisticsExtract = %v, want %v", got, want)
}
})
}
}