diff options
| author |   Haichao Liu <liuhaichao@bytedance.com> | 2020-11-18 20:53:22 +0800 |
|---|---|---|
| committer |   Jason A. Donenfeld <Jason@zx2c4.com> | 2020-11-18 14:22:15 +0100 |
| commit | 913f68ce3820801e045632cb05c6f11e0df50b47 (patch) | |
| tree | fb7ef8b175cfd7372ff8c5736d24381b6d2d8086 /device/peer.go | |
| parent | wintun: load from filesystem by default (diff) | |
| download | wireguard-go-913f68ce3820801e045632cb05c6f11e0df50b47.tar.xz wireguard-go-913f68ce3820801e045632cb05c6f11e0df50b47.zip | |
device: add write queue mutex for peer
fix panic: send on closed channel when remove peer
Signed-off-by: Haichao Liu <liuhaichao@bytedance.com>
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Diffstat (limited to 'device/peer.go')
| -rw-r--r-- | device/peer.go | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/device/peer.go b/device/peer.go index ef6c010..78204bb 100644 --- a/device/peer.go +++ b/device/peer.go @@ -58,6 +58,7 @@ type Peer struct { } queue struct { + sync.RWMutex nonce chan *QueueOutboundElement // nonce / pre-handshake queue outbound chan *QueueOutboundElement // sequential ordering of work inbound chan *QueueInboundElement // sequential ordering of work @@ -195,10 +196,11 @@ func (peer *Peer) Start() { peer.routines.stopping.Add(PeerRoutineNumber) // prepare queues - + peer.queue.Lock() peer.queue.nonce = make(chan *QueueOutboundElement, QueueOutboundSize) peer.queue.outbound = make(chan *QueueOutboundElement, QueueOutboundSize) peer.queue.inbound = make(chan *QueueInboundElement, QueueInboundSize) + peer.queue.Unlock() peer.timersInit() peer.handshake.lastSentHandshake = time.Now().Add(-(RekeyTimeout + time.Second)) @@ -284,9 +286,11 @@ func (peer *Peer) Stop() { // close queues + peer.queue.Lock() close(peer.queue.nonce) close(peer.queue.outbound) close(peer.queue.inbound) + peer.queue.Unlock() peer.ZeroAndFlushAll() } |