TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2024-11-25 19:15:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

wgengine/magicsock: fix/disable a few misc things to get js/wasm working

Browse Source 
Updates #3157

Change-Id: Ie9e3a772bb9878584080bb257b32150492e26eaf
Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com>
This commit is contained in:
Brad Fitzpatrick 2021-10-22 09:09:37 -07:00
parent a8e2cceefd
commit ed3fb197ad
1 changed files with 35 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
wgengine/magicsock/magicsock.go
View File

@ -634,7 +634,7 @@ func (c *Conn) updateEndpoints(why string) {
c.muCond.Broadcast() c.muCond.Broadcast()
}() }()
c.logf("[v1] magicsock: starting endpoint update (%s)", why) c.logf("[v1] magicsock: starting endpoint update (%s)", why)
if c.noV4Send.Get() { if c.noV4Send.Get() && runtime.GOOS != "js" {
c.mu.Lock() c.mu.Lock()
closed := c.closed closed := c.closed
c.mu.Unlock() c.mu.Unlock()
@ -1014,10 +1014,11 @@ func (c *Conn) goDerpConnect(node int) {
// //
// c.mu must NOT be held. // c.mu must NOT be held.
func (c *Conn) determineEndpoints(ctx context.Context) ([]tailcfg.Endpoint, error) { func (c *Conn) determineEndpoints(ctx context.Context) ([]tailcfg.Endpoint, error) {
if runtime.GOOS == "js" { var havePortmap bool
return nil, nil var portmapExt netaddr.IPPort
if runtime.GOOS != "js" {
portmapExt, havePortmap = c.portMapper.GetCachedMappingOrStartCreatingOne()
} }
portmapExt, havePortmap := c.portMapper.GetCachedMappingOrStartCreatingOne()
nr, err := c.updateNetInfo(ctx) nr, err := c.updateNetInfo(ctx)
if err != nil { if err != nil {
@ -1025,6 +1026,18 @@ func (c *Conn) determineEndpoints(ctx context.Context) ([]tailcfg.Endpoint, erro
return nil, err return nil, err
} }
if runtime.GOOS == "js" {
// TODO(bradfitz): why does control require an
// endpoint? Otherwise it doesn't stream map responses
// back.
return []tailcfg.Endpoint{
{
Addr: netaddr.MustParseIPPort("[fe80:123:456:789::1]:12345"),
Type: tailcfg.EndpointLocal,
},
}, nil
}
already := make(map[netaddr.IPPort]tailcfg.EndpointType) // endpoint -> how it was found already := make(map[netaddr.IPPort]tailcfg.EndpointType) // endpoint -> how it was found
var eps []tailcfg.Endpoint // unique endpoints var eps []tailcfg.Endpoint // unique endpoints
@ -1165,6 +1178,8 @@ func (c *Conn) Send(b []byte, ep conn.Endpoint) error {
var errDropDerpPacket = errors.New("too many DERP packets queued; dropping") var errDropDerpPacket = errors.New("too many DERP packets queued; dropping")
var errNoUDP = errors.New("no UDP available on platform")
var udpAddrPool = &sync.Pool{ var udpAddrPool = &sync.Pool{
New: func() interface{} { return new(net.UDPAddr) }, New: func() interface{} { return new(net.UDPAddr) },
} }
@ -1172,6 +1187,9 @@ func (c *Conn) Send(b []byte, ep conn.Endpoint) error {
// sendUDP sends UDP packet b to ipp. // sendUDP sends UDP packet b to ipp.
// See sendAddr's docs on the return value meanings. // See sendAddr's docs on the return value meanings.
func (c *Conn) sendUDP(ipp netaddr.IPPort, b []byte) (sent bool, err error) { func (c *Conn) sendUDP(ipp netaddr.IPPort, b []byte) (sent bool, err error) {
if runtime.GOOS == "js" {
return false, errNoUDP
}
ua := udpAddrPool.Get().(*net.UDPAddr) ua := udpAddrPool.Get().(*net.UDPAddr)
sent, err = c.sendUDPStd(ipp.UDPAddrAt(ua), b) sent, err = c.sendUDPStd(ipp.UDPAddrAt(ua), b)
if err == nil { if err == nil {
@ -2742,6 +2760,9 @@ func (c *Conn) bindSocket(rucPtr **RebindingUDPConn, network string, curPortFate
// rebind closes and re-binds the UDP sockets. // rebind closes and re-binds the UDP sockets.
// We consider it successful if we manage to bind the IPv4 socket. // We consider it successful if we manage to bind the IPv4 socket.
func (c *Conn) rebind(curPortFate currentPortFate) error { func (c *Conn) rebind(curPortFate currentPortFate) error {
if runtime.GOOS == "js" {
return nil
}
if err := c.bindSocket(&c.pconn4, "udp4", curPortFate); err != nil { if err := c.bindSocket(&c.pconn4, "udp4", curPortFate); err != nil {
return fmt.Errorf("magicsock: Rebind IPv4 failed: %w", err) return fmt.Errorf("magicsock: Rebind IPv4 failed: %w", err)
} }
@ -3372,6 +3393,9 @@ func (de *endpoint) heartbeat() {
// //
// de.mu must be held. // de.mu must be held.
func (de *endpoint) wantFullPingLocked(now mono.Time) bool { func (de *endpoint) wantFullPingLocked(now mono.Time) bool {
if runtime.GOOS == "js" {
return false
}
if !de.canP2P() { if !de.canP2P() {
return false return false
} }
@ -3518,6 +3542,9 @@ func (de *endpoint) startPingLocked(ep netaddr.IPPort, now mono.Time, purpose di
if !de.canP2P() { if !de.canP2P() {
panic("tried to disco ping a peer that can't disco") panic("tried to disco ping a peer that can't disco")
} }
if runtime.GOOS == "js" {
return
}
if purpose != pingCLI { if purpose != pingCLI {
st, ok := de.endpointState[ep] st, ok := de.endpointState[ep]
if !ok { if !ok {
@ -3798,6 +3825,10 @@ func (de *endpoint) handleCallMeMaybe(m *disco.CallMeMaybe) {
// How did we receive a disco message from a peer that can't disco? // How did we receive a disco message from a peer that can't disco?
panic("got call-me-maybe from peer with no discokey") panic("got call-me-maybe from peer with no discokey")
} }
if runtime.GOOS == "js" {
// Nothing to do on js/wasm if we can't send UDP packets anyway.
return
}
de.mu.Lock() de.mu.Lock()
defer de.mu.Unlock() defer de.mu.Unlock()