More robust solution to close deadlock

2018-05-05 06:00:38 +02:00 · 2018-05-05 06:00:38 +02:00 · a46401bbb1
commit a46401bbb1
parent 09a9bc2899
3 changed files with 33 additions and 31 deletions
--- a/receive.go
+++ b/receive.go
@ -238,17 +238,7 @@ func (device *Device) RoutineDecryption() {

 	logDebug := device.log.Debug
 	defer func() {
-		for {
-			select {
-			case elem, ok := <-device.queue.decryption:
-				if ok {
-					elem.Drop()
-				}
-			default:
-				goto out
-			}
-		}
-		out:
+		device.state.stopping.Done()
 		logDebug.Println("Routine: decryption worker - stopped")
 	}()
 	logDebug.Println("Routine: decryption worker - started")
@ -314,14 +304,7 @@ func (device *Device) RoutineHandshake() {
 	logDebug := device.log.Debug

 	defer func() {
-		for {
-			select {
-			case <-device.queue.handshake:
-			default:
-				goto out
-			}
-		}
-		out:
+		device.state.stopping.Done()
 		logDebug.Println("Routine: handshake worker - stopped")
 	}()