aboutsummaryrefslogtreecommitdiffstats
path: root/device/send.go
diff options
context:
space:
mode:
Diffstat (limited to 'device/send.go')
-rw-r--r--device/send.go20
1 files changed, 2 insertions, 18 deletions
diff --git a/device/send.go b/device/send.go
index 55df4b3..c9b62e6 100644
--- a/device/send.go
+++ b/device/send.go
@@ -97,23 +97,6 @@ func addToNonceQueue(queue chan *QueueOutboundElement, elem *QueueOutboundElemen
}
}
-func addToOutboundAndEncryptionQueues(outboundQueue chan *QueueOutboundElement, encryptionQueue chan *QueueOutboundElement, elem *QueueOutboundElement) {
- select {
- case outboundQueue <- elem:
- select {
- case encryptionQueue <- elem:
- return
- default:
- elem.Drop()
- elem.peer.device.PutMessageBuffer(elem.buffer)
- elem.Unlock()
- }
- default:
- elem.peer.device.PutMessageBuffer(elem.buffer)
- elem.peer.device.PutOutboundElement(elem)
- }
-}
-
/* Queues a keepalive if no packets are queued for peer
*/
func (peer *Peer) SendKeepalive() bool {
@@ -457,7 +440,8 @@ NextPacket:
elem.Lock()
// add to parallel and sequential queue
- addToOutboundAndEncryptionQueues(peer.queue.outbound, device.queue.encryption.c, elem)
+ peer.queue.outbound <- elem
+ device.queue.encryption.c <- elem
}
}
}