TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-04-16 03:31:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

wgengine/magicsock: don't run UDP listeners on js/wasm

Browse Source 
Be DERP-only for now. (WebRTC can come later :))

Updates #3157

Change-Id: I56ebb3d914e37e8f4ab651306fd705b817ca381c
Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com>
This commit is contained in:
Brad Fitzpatrick 2021-10-20 12:14:19 -07:00 committed by Brad Fitzpatrick
parent 8efc306e4f
commit 6cb2705833
1 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
wgengine/magicsock/magicsock.go
View File

@ -19,6 +19,7 @@ import (
"net" "net"
"os" "os"
"reflect" "reflect"
"runtime"
"sort" "sort"
"strconv" "strconv"
"strings" "strings"
@ -2453,9 +2454,16 @@ func (c *connBind) Open(ignoredPort uint16) ([]conn.ReceiveFunc, uint16, error)
} }
c.closed = false c.closed = false
fns := []conn.ReceiveFunc{c.receiveIPv4, c.receiveIPv6, c.receiveDERP} fns := []conn.ReceiveFunc{c.receiveIPv4, c.receiveIPv6, c.receiveDERP}
var port uint16
if runtime.GOOS == "js" {
fns = []conn.ReceiveFunc{c.receiveDERP}
port = 12345
} else {
port = c.LocalPort()
}
// TODO: Combine receiveIPv4 and receiveIPv6 and receiveIP into a single // TODO: Combine receiveIPv4 and receiveIPv6 and receiveIP into a single
// closure that closes over a *RebindingUDPConn? // closure that closes over a *RebindingUDPConn?
return fns, c.LocalPort(), nil return fns, port, nil
} }
// SetMark is used by wireguard-go to set a mark bit for packets to avoid routing loops. // SetMark is used by wireguard-go to set a mark bit for packets to avoid routing loops.
@ -2473,8 +2481,12 @@ func (c *connBind) Close() error {
} }
c.closed = true c.closed = true
// Unblock all outstanding receives. // Unblock all outstanding receives.
c.pconn4.Close() if c.pconn4 != nil {
c.pconn6.Close() c.pconn4.Close()
}
if c.pconn6 != nil {
c.pconn6.Close()
}
// Send an empty read result to unblock receiveDERP, // Send an empty read result to unblock receiveDERP,
// which will then check connBind.Closed. // which will then check connBind.Closed.
c.derpRecvCh <- derpReadResult{} c.derpRecvCh <- derpReadResult{}
@ -2515,7 +2527,9 @@ func (c *Conn) Close() error {
if c.pconn6 != nil { if c.pconn6 != nil {
c.pconn6.Close() c.pconn6.Close()
} }
c.pconn4.Close() if c.pconn4 != nil {
c.pconn4.Close()
}
// Wait on goroutines updating right at the end, once everything is // Wait on goroutines updating right at the end, once everything is
// already closed. We want everything else in the Conn to be // already closed. We want everything else in the Conn to be
@ -2621,6 +2635,9 @@ func (c *Conn) ReSTUN(why string) {
} }
func (c *Conn) initialBind() error { func (c *Conn) initialBind() error {
if runtime.GOOS == "js" {
return nil
}
if err := c.bindSocket(&c.pconn4, "udp4", keepCurrentPort); err != nil { if err := c.bindSocket(&c.pconn4, "udp4", keepCurrentPort); err != nil {
return fmt.Errorf("magicsock: initialBind IPv4 failed: %w", err) return fmt.Errorf("magicsock: initialBind IPv4 failed: %w", err)
} }