snow/wireguard-go
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

device: only allocate peer queues once

Browse source 
This serves two purposes.

First, it makes repeatedly stopping then starting a peer cheaper.
Second, it prevents a data race observed accessing the queues.

Signed-off-by: Josh Bleecher Snyder <josh@tailscale.com>
This commit is contained in:
Josh Bleecher Snyder 2021-02-09 09:08:17 -08:00 committed by Jason A. Donenfeld
parent cae090d116
commit 78ebce6932
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
device/peer.go
View file

@ -179,10 +179,10 @@ func (peer *Peer) Start() {
peer.handshake.lastSentHandshake = time.Now().Add(-(RekeyTimeout + time.Second)) peer.handshake.lastSentHandshake = time.Now().Add(-(RekeyTimeout + time.Second))
peer.handshake.mutex.Unlock() peer.handshake.mutex.Unlock()
// prepare queues // prepare queues (once)
if peer.queue.outbound == nil {
peer.queue.outbound = newAutodrainingOutboundQueue(device) peer.queue.outbound = newAutodrainingOutboundQueue(device)
peer.queue.inbound = newAutodrainingInboundQueue(device) peer.queue.inbound = newAutodrainingInboundQueue(device)
if peer.queue.staged == nil {
peer.queue.staged = make(chan *QueueOutboundElement, QueueStagedSize) peer.queue.staged = make(chan *QueueOutboundElement, QueueStagedSize)
} }
peer.device.queue.encryption.wg.Add(1) // keep encryption queue open for our writes peer.device.queue.encryption.wg.Add(1) // keep encryption queue open for our writes