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

device: always name *Queue*Element variables elem

Browse source 
They're called elem in most places.
Rename a few local variables to make it consistent.
This makes it easier to grep the code for things like elem.Drop.

Signed-off-by: Josh Bleecher Snyder <josh@tailscale.com>
This commit is contained in:
Josh Bleecher Snyder 2020-12-15 16:00:52 -08:00 committed by Jason A. Donenfeld
parent 2832e96339
commit c8faa34cde
3 changed files with 26 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
device/pools.go
View file

@ -64,12 +64,12 @@ func (device *Device) GetInboundElement() *QueueInboundElement {
}
}
func (device *Device) PutInboundElement(msg *QueueInboundElement) {
msg.clearPointers()
func (device *Device) PutInboundElement(elem *QueueInboundElement) {
elem.clearPointers()
if PreallocatedBuffersPerPool == 0 {
device.pool.inboundElementPool.Put(msg)
device.pool.inboundElementPool.Put(elem)
} else {
device.pool.inboundElementReuseChan <- msg
device.pool.inboundElementReuseChan <- elem
}
}
@ -81,11 +81,11 @@ func (device *Device) GetOutboundElement() *QueueOutboundElement {
}
}
func (device *Device) PutOutboundElement(msg *QueueOutboundElement) {
msg.clearPointers()
func (device *Device) PutOutboundElement(elem *QueueOutboundElement) {
elem.clearPointers()
if PreallocatedBuffersPerPool == 0 {
device.pool.outboundElementPool.Put(msg)
device.pool.outboundElementPool.Put(elem)
} else {
device.pool.outboundElementReuseChan <- msg
device.pool.outboundElementReuseChan <- elem
}
}

16
device/receive.go
View file

@ -56,26 +56,26 @@ func (elem *QueueInboundElement) IsDropped() bool {
return atomic.LoadInt32(&elem.dropped) == AtomicTrue
}
func (device *Device) addToInboundAndDecryptionQueues(inboundQueue chan *QueueInboundElement, decryptionQueue chan *QueueInboundElement, element *QueueInboundElement) bool {
func (device *Device) addToInboundAndDecryptionQueues(inboundQueue chan *QueueInboundElement, decryptionQueue chan *QueueInboundElement, elem *QueueInboundElement) bool {
select {
case inboundQueue <- element:
case inboundQueue <- elem:
select {
case decryptionQueue <- element:
case decryptionQueue <- elem:
return true
default:
element.Drop()
element.Unlock()
elem.Drop()
elem.Unlock()
return false
}
default:
device.PutInboundElement(element)
device.PutInboundElement(elem)
return false
}
}
func (device *Device) addToHandshakeQueue(queue chan QueueHandshakeElement, element QueueHandshakeElement) bool {
func (device *Device) addToHandshakeQueue(queue chan QueueHandshakeElement, elem QueueHandshakeElement) bool {
select {
case queue <- element:
case queue <- elem:
return true
default:
return false

20
device/send.go
View file

@ -81,10 +81,10 @@ func (elem *QueueOutboundElement) IsDropped() bool {
return atomic.LoadInt32(&elem.dropped) == AtomicTrue
}
func addToNonceQueue(queue chan *QueueOutboundElement, element *QueueOutboundElement, device *Device) {
func addToNonceQueue(queue chan *QueueOutboundElement, elem *QueueOutboundElement, device *Device) {
for {
select {
case queue <- element:
case queue <- elem:
return
default:
select {
@ -97,20 +97,20 @@ func addToNonceQueue(queue chan *QueueOutboundElement, element *QueueOutboundEle
}
}
func addToOutboundAndEncryptionQueues(outboundQueue chan *QueueOutboundElement, encryptionQueue chan *QueueOutboundElement, element *QueueOutboundElement) {
func addToOutboundAndEncryptionQueues(outboundQueue chan *QueueOutboundElement, encryptionQueue chan *QueueOutboundElement, elem *QueueOutboundElement) {
select {
case outboundQueue <- element:
case outboundQueue <- elem:
select {
case encryptionQueue <- element:
case encryptionQueue <- elem:
return
default:
element.Drop()
element.peer.device.PutMessageBuffer(element.buffer)
element.Unlock()
elem.Drop()
elem.peer.device.PutMessageBuffer(elem.buffer)
elem.Unlock()
}
default:
element.peer.device.PutMessageBuffer(element.buffer)
element.peer.device.PutOutboundElement(element)
elem.peer.device.PutMessageBuffer(elem.buffer)
elem.peer.device.PutOutboundElement(elem)
}
}