mirrors/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2026-05-05 12:16:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

net/tstun: add inner loop to poll

Browse Source 
This avoids re-enqueuing buf, which makes the code a bit clearer.

Signed-off-by: Josh Bleecher Snyder <josh@tailscale.com>
This commit is contained in:
Josh Bleecher Snyder 2021-07-01 13:10:56 -07:00
parent 16364c1446
commit fe14ba9c54
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
net/tstun/wrap.go
View File

@ -290,12 +290,18 @@ func (t *Wrapper) poll() {
// This is the rationale behind the tun.Wrapper.{Read,Write} interfaces
// and the reason t.buffer has size MaxMessageSize and not MaxContentSize.
// In principle, read errors are not fatal (but wireguard-go disagrees).
n, err := t.tdev.Read(buf, PacketStartOffset)
// Wireguard will skip an empty read,
// so we might as well do it here to avoid the send through t.outbound.
if n == 0 && err == nil {
t.bufferC <- buf
continue
//
// We loop here until we get a non-empty (or failed) read.
// We don't need this loop for correctness,
// but wireguard-go will skip an empty read,
// so we might as well avoid the send through t.outbound.
var n int
var err error
for n == 0 && err == nil {
if t.closed() {
return
}
n, err = t.tdev.Read(buf, PacketStartOffset)
}
t.outbound <- tunReadResult{
data: buf[PacketStartOffset : PacketStartOffset+n],