package/wireguard-go
1
0
Fork 0
mirror of https://git.zx2c4.com/wireguard-go synced 2025-10-06 09:07:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

device: remove selects from encrypt/decrypt/inbound/outbound enqueuing

Browse Source 
Block instead. Backpressure here is fine, probably preferable.
This reduces code complexity.

Signed-off-by: Josh Bleecher Snyder <josh@tailscale.com>
This commit is contained in:
Josh Bleecher Snyder
2021-01-11 17:21:16 -08:00
committed by Jason A. Donenfeld
parent 0cc15e7c7c
commit 2fe19ce54d
2 changed files with 5 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
device/receive.go
View File

@@ -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)
}