device: tie encryption queue lifetime to the peers that write to it

Signed-off-by: Josh Bleecher Snyder <josh@tailscale.com>
This commit is contained in:
Josh Bleecher Snyder
2021-02-02 10:46:34 -08:00
committed by Jason A. Donenfeld
parent 4846070322
commit 8a374a35a0
3 changed files with 6 additions and 4 deletions

View File

@@ -397,6 +397,10 @@ func (device *Device) Close() {
device.isUp.Set(false)
// Remove peers before closing queues,
// because peers assume that queues are active.
device.RemoveAllPeers()
// We kept a reference to the encryption and decryption queues,
// in case we started any new peers that might write to them.
// No new peers are coming; we are done with these queues.
@@ -405,8 +409,6 @@ func (device *Device) Close() {
device.queue.handshake.wg.Done()
device.state.stopping.Wait()
device.RemoveAllPeers()
device.rate.limiter.Close()
device.state.changing.Set(false)