mirrors/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-10-28 06:41:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

wgengine/magicsock: use eventbus.SubscribeFunc in Conn

Browse Source 
Updates #15160
Updates #17487

Change-Id: Ic9eb8d82b21d9dc38cb3c681b87101dfbc95af16
Signed-off-by: M. J. Fromberger <fromberger@tailscale.com>
This commit is contained in:
M. J. Fromberger 2025-10-07 17:03:39 -07:00 committed by M. J. Fromberger
parent 5833730577
commit 241ea1c98b
1 changed files with 21 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
wgengine/magicsock/magicsock.go
View File

@ -156,7 +156,7 @@ type Conn struct {
// struct. Initialized once at construction, then constant. // struct. Initialized once at construction, then constant.
eventBus *eventbus.Bus eventBus *eventbus.Bus
eventSubs eventbus.Monitor eventClient *eventbus.Client
logf logger.Logf logf logger.Logf
epFunc func([]tailcfg.Endpoint) epFunc func([]tailcfg.Endpoint)
derpActiveFunc func() derpActiveFunc func()
@ -625,43 +625,6 @@ func newConn(logf logger.Logf) *Conn {
return c return c
} }
// consumeEventbusTopics consumes events from all [Conn]-relevant
// [eventbus.Subscriber]'s and passes them to their related handler. Events are
// always handled in the order they are received, i.e. the next event is not
// read until the previous event's handler has returned. It returns when the
// [eventbus.Client] is closed.
func (c *Conn) consumeEventbusTopics(cli *eventbus.Client) func(*eventbus.Client) {
// Subscribe calls must return before NewConn otherwise published
// events can be missed.
pmSub := eventbus.Subscribe[portmappertype.Mapping](cli)
filterSub := eventbus.Subscribe[FilterUpdate](cli)
nodeViewsSub := eventbus.Subscribe[NodeViewsUpdate](cli)
nodeMutsSub := eventbus.Subscribe[NodeMutationsUpdate](cli)
syncSub := eventbus.Subscribe[syncPoint](cli)
allocRelayEndpointSub := eventbus.Subscribe[UDPRelayAllocResp](cli)
return func(cli *eventbus.Client) {
for {
select {
case <-cli.Done():
return
case <-pmSub.Events():
c.onPortMapChanged()
case filterUpdate := <-filterSub.Events():
c.onFilterUpdate(filterUpdate)
case nodeViews := <-nodeViewsSub.Events():
c.onNodeViewsUpdate(nodeViews)
case nodeMuts := <-nodeMutsSub.Events():
c.onNodeMutationsUpdate(nodeMuts)
case syncPoint := <-syncSub.Events():
c.dlogf("magicsock: received sync point after reconfig")
syncPoint.Signal()
case allocResp := <-allocRelayEndpointSub.Events():
c.onUDPRelayAllocResp(allocResp)
}
}
}
}
func (c *Conn) onUDPRelayAllocResp(allocResp UDPRelayAllocResp) { func (c *Conn) onUDPRelayAllocResp(allocResp UDPRelayAllocResp) {
c.mu.Lock() c.mu.Lock()
defer c.mu.Unlock() defer c.mu.Unlock()
@ -726,11 +689,20 @@ func NewConn(opts Options) (*Conn, error) {
// Set up publishers and subscribers. Subscribe calls must return before // Set up publishers and subscribers. Subscribe calls must return before
// NewConn otherwise published events can be missed. // NewConn otherwise published events can be missed.
cli := c.eventBus.Client("magicsock.Conn") ec := c.eventBus.Client("magicsock.Conn")
c.syncPub = eventbus.Publish[syncPoint](cli) c.eventClient = ec
c.allocRelayEndpointPub = eventbus.Publish[UDPRelayAllocReq](cli) c.syncPub = eventbus.Publish[syncPoint](ec)
c.portUpdatePub = eventbus.Publish[router.PortUpdate](cli) c.allocRelayEndpointPub = eventbus.Publish[UDPRelayAllocReq](ec)
c.eventSubs = cli.Monitor(c.consumeEventbusTopics(cli)) c.portUpdatePub = eventbus.Publish[router.PortUpdate](ec)
eventbus.SubscribeFunc(ec, c.onPortMapChanged)
eventbus.SubscribeFunc(ec, c.onFilterUpdate)
eventbus.SubscribeFunc(ec, c.onNodeViewsUpdate)
eventbus.SubscribeFunc(ec, c.onNodeMutationsUpdate)
eventbus.SubscribeFunc(ec, func(sp syncPoint) {
c.dlogf("magicsock: received sync point after reconfig")
sp.Signal()
})
eventbus.SubscribeFunc(ec, c.onUDPRelayAllocResp)
c.connCtx, c.connCtxCancel = context.WithCancel(context.Background()) c.connCtx, c.connCtxCancel = context.WithCancel(context.Background())
c.donec = c.connCtx.Done() c.donec = c.connCtx.Done()
@ -3307,13 +3279,12 @@ func (c *connBind) isClosed() bool {
// //
// Only the first close does anything. Any later closes return nil. // Only the first close does anything. Any later closes return nil.
func (c *Conn) Close() error { func (c *Conn) Close() error {
// Close the [eventbus.Client] and wait for c.consumeEventbusTopics to // Close the [eventbus.Client] to wait for subscribers to
// return before acquiring c.mu: // return before acquiring c.mu:
// 1. Conn.consumeEventbusTopics event handlers also acquire c.mu, they can // 1. Event handlers also acquire c.mu, they can deadlock with c.Close().
// deadlock with c.Close(). // 2. Event handlers may not guard against undesirable post/in-progress
// 2. Conn.consumeEventbusTopics event handlers may not guard against // Conn.Close() behaviors.
// undesirable post/in-progress Conn.Close() behaviors. c.eventClient.Close()
c.eventSubs.Close()
c.mu.Lock() c.mu.Lock()
defer c.mu.Unlock() defer c.mu.Unlock()
@ -3410,7 +3381,7 @@ func (c *Conn) shouldDoPeriodicReSTUNLocked() bool {
return true return true
} }
func (c *Conn) onPortMapChanged() { c.ReSTUN("portmap-changed") } func (c *Conn) onPortMapChanged(portmappertype.Mapping) { c.ReSTUN("portmap-changed") }
// ReSTUN triggers an address discovery. // ReSTUN triggers an address discovery.
// The provided why string is for debug logging only. // The provided why string is for debug logging only.