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

derp: reduce DERP memory use; don't require callers to pass in memory to use

Browse Source 
The magicsock derpReader was holding onto 65KB for each DERP
connection forever, just in case.

Make the derp{,http}.Client be in charge of memory instead. It can
reuse its bufio.Reader buffer space.
This commit is contained in:
Brad Fitzpatrick
2020-06-15 10:26:50 -07:00
parent 15a23ce65f
commit abd79ea368
6 changed files with 62 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
derp/derp_test.go
View File

@ -90,8 +90,7 @@ func TestSendRecv(t *testing.T) {
for i := 0; i < numClients; i++ {
go func(i int) {
for {
b := make([]byte, 1<<16)
m, err := clients[i].Recv(b)
m, err := clients[i].Recv()
if err != nil {
errCh <- err
return
@ -106,7 +105,7 @@ func TestSendRecv(t *testing.T) {
if m.Source.IsZero() {
t.Errorf("zero Source address in ReceivedPacket")
}
recvChs[i] <- m.Data
recvChs[i] <- append([]byte(nil), m.Data...)
}
}
}(i)
@ -259,8 +258,7 @@ func TestSendFreeze(t *testing.T) {
recv := func(name string, client *Client) {
ch := chs(name)
for {
b := make([]byte, 1<<9)
m, err := client.Recv(b)
m, err := client.Recv()
if err != nil {
errCh <- fmt.Errorf("%s: %w", name, err)
return
@ -529,9 +527,8 @@ func (tc *testClient) wantPresent(t *testing.T, peers ...key.Public) {
want[k] = true
}
var buf [64 << 10]byte
for {
m, err := tc.c.recvTimeout(buf[:], time.Second)
m, err := tc.c.recvTimeout(time.Second)
if err != nil {
t.Fatal(err)
}
@ -557,8 +554,7 @@ func (tc *testClient) wantPresent(t *testing.T, peers ...key.Public) {
func (tc *testClient) wantGone(t *testing.T, peer key.Public) {
t.Helper()
var buf [64 << 10]byte
m, err := tc.c.recvTimeout(buf[:], time.Second)
m, err := tc.c.recvTimeout(time.Second)
if err != nil {
t.Fatal(err)
}