Removed remaining signals from peer

1. Removed remaining signals from peer struct
2. Made needAnotherKeepalive local
3. Removed environment check from warning text (annoying when debugging)

1 files changed, 7 insertions, 4 deletions

diff --git a/send.go b/send.go
index 7423e3b..a7c68be 100644
--- a/send.go
+++ b/send.go
@@ -209,8 +209,11 @@ func (peer *Peer) RoutineNonce() {
 
 	for {
 	NextPacket:
+
+		peer.event.flushNonceQueue.Clear()
+
 		select {
-		case <-peer.routines.stop.Wait():
+		case <-peer.routines.stop:
 			return
 
 		case elem, ok := <-peer.queue.nonce:
@@ -239,9 +242,9 @@ func (peer *Peer) RoutineNonce() {
 				select {
 				case <-peer.event.newKeyPair.C:
 					logDebug.Println(peer, ": Obtained awaited key-pair")
-				case <-peer.signal.flushNonceQueue:
+				case <-peer.event.flushNonceQueue.C:
 					goto NextPacket
-				case <-peer.routines.stop.Wait():
+				case <-peer.routines.stop:
 					return
 				}
 			}
@@ -368,7 +371,7 @@ func (peer *Peer) RoutineSequentialSender() {
 	for {
 		select {
 
-		case <-peer.routines.stop.Wait():
+		case <-peer.routines.stop:
 			return
 
 		case elem, ok := <-peer.queue.outbound: