From 2fe19ce54db258d8c47ff03d8335fd28c7c7ad0f Mon Sep 17 00:00:00 2001 From: Josh Bleecher Snyder Date: Mon, 11 Jan 2021 17:21:16 -0800 Subject: device: remove selects from encrypt/decrypt/inbound/outbound enqueuing Block instead. Backpressure here is fine, probably preferable. This reduces code complexity. Signed-off-by: Josh Bleecher Snyder --- device/receive.go | 23 +++-------------------- 1 file changed, 3 insertions(+), 20 deletions(-) (limited to 'device/receive.go') diff --git a/device/receive.go b/device/receive.go index 20e0c8f..972b342 100644 --- a/device/receive.go +++ b/device/receive.go @@ -58,23 +58,6 @@ func (elem *QueueInboundElement) IsDropped() bool { return atomic.LoadInt32(&elem.dropped) == AtomicTrue } -func (device *Device) addToInboundAndDecryptionQueues(inboundQueue chan *QueueInboundElement, decryptionQueue chan *QueueInboundElement, elem *QueueInboundElement) bool { - select { - case inboundQueue <- elem: - select { - case decryptionQueue <- elem: - return true - default: - elem.Drop() - elem.Unlock() - return false - } - default: - device.PutInboundElement(elem) - return false - } -} - func (device *Device) addToHandshakeQueue(queue chan QueueHandshakeElement, elem QueueHandshakeElement) bool { select { case queue <- elem: @@ -207,9 +190,9 @@ func (device *Device) RoutineReceiveIncoming(IP int, bind conn.Bind) { peer.queue.RLock() if peer.isRunning.Get() { - if device.addToInboundAndDecryptionQueues(peer.queue.inbound, device.queue.decryption.c, elem) { - buffer = device.GetMessageBuffer() - } + peer.queue.inbound <- elem + device.queue.decryption.c <- elem + buffer = device.GetMessageBuffer() } else { device.PutInboundElement(elem) } -- cgit v1.2.3-59-g8ed1b