diff options
| author | Jason A. Donenfeld <Jason@zx2c4.com> | 2021-02-09 19:26:45 +0100 |
|---|---|---|
| committer | Jason A. Donenfeld <Jason@zx2c4.com> | 2021-02-09 19:26:45 +0100 |
| commit | da32fe328bb2958773b07280c62eaebb6857f4df (patch) | |
| tree | 6e900580cc61e74f7d60dc8b9136dba8a62c7e96 /device | |
| parent | 4eab21a7b7192dc806a3d60c46827866fc8942fe (diff) | |
device: handshake routine writes into encryption queue
Since RoutineHandshake calls peer.SendKeepalive(), it potentially is a
writer into the encryption queue, so we need to bump the wg count.
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Diffstat (limited to 'device')
| -rw-r--r-- | device/device.go | 1 | ||||
| -rw-r--r-- | device/receive.go | 5 |
2 files changed, 5 insertions, 1 deletions
diff --git a/device/device.go b/device/device.go index 9375448..7f96a1e 100644 --- a/device/device.go +++ b/device/device.go @@ -305,6 +305,7 @@ func NewDevice(tunDevice tun.Device, logger *Logger) *Device { cpus := runtime.NumCPU() device.state.stopping.Wait() + device.queue.encryption.wg.Add(cpus) // One for each RoutineHandshake for i := 0; i < cpus; i++ { go device.RoutineEncryption() go device.RoutineDecryption() diff --git a/device/receive.go b/device/receive.go index 3fc6831..6b9cccd 100644 --- a/device/receive.go +++ b/device/receive.go @@ -237,7 +237,10 @@ func (device *Device) RoutineDecryption() { /* Handles incoming packets related to handshake */ func (device *Device) RoutineHandshake() { - defer device.log.Verbosef("Routine: handshake worker - stopped") + defer func() { + device.log.Verbosef("Routine: handshake worker - stopped") + device.queue.encryption.wg.Done() + }() device.log.Verbosef("Routine: handshake worker - started") for elem := range device.queue.handshake.c { |