From eafa3df60689d3ad2b4316c42a8360ed47072a00 Mon Sep 17 00:00:00 2001
From: Mathias Hall-Andersen <mathias@hall-andersen.dk>
Date: Fri, 25 Aug 2017 14:53:23 +0200
Subject: Added fwmark code

---
 src/receive.go | 25 ++++++++++++++++++++++---
 1 file changed, 22 insertions(+), 3 deletions(-)

(limited to 'src/receive.go')

diff --git a/src/receive.go b/src/receive.go
index 4c76bbf..ca7bb6e 100644
--- a/src/receive.go
+++ b/src/receive.go
@@ -54,6 +54,26 @@ func (device *Device) addToInboundQueue(
 	}
 }
 
+func (device *Device) addToDecryptionQueue(
+	queue chan *QueueInboundElement,
+	element *QueueInboundElement,
+) {
+	for {
+		select {
+		case queue <- element:
+			return
+		default:
+			select {
+			case old := <-queue:
+				// drop & release to potential consumer
+				old.Drop()
+				old.mutex.Unlock()
+			default:
+			}
+		}
+	}
+}
+
 func (device *Device) addToHandshakeQueue(
 	queue chan QueueHandshakeElement,
 	element QueueHandshakeElement,
@@ -167,7 +187,7 @@ func (device *Device) RoutineReceiveIncomming() {
 
 					// add to decryption queues
 
-					device.addToInboundQueue(device.queue.decryption, elem)
+					device.addToDecryptionQueue(device.queue.decryption, elem)
 					device.addToInboundQueue(peer.queue.inbound, elem)
 					buffer = device.GetMessageBuffer()
 					continue
@@ -218,7 +238,6 @@ func (device *Device) RoutineDecryption() {
 		// check if dropped
 
 		if elem.IsDropped() {
-			elem.mutex.Unlock() // TODO: Make consistent with send
 			continue
 		}
 
@@ -256,7 +275,7 @@ func (device *Device) RoutineHandshake() {
 	logDebug := device.log.Debug
 	logDebug.Println("Routine, handshake routine, started for device")
 
-	var temp [256]byte
+	var temp [MessageHandshakeSize]byte
 	var elem QueueHandshakeElement
 
 	for {
-- 
cgit v1.2.3