From 691192ff5ae5a3f012f5f616327645b01e4c1462 Mon Sep 17 00:00:00 2001
From: Arceliar <Arceliar@users.noreply.github.com>
Date: Sat, 21 Sep 2019 14:33:45 -0500
Subject: [PATCH] weird scheduler hack, seems to tend to make things more
 stable without actually locking streams to any particular link

---
 src/yggdrasil/switch.go | 11 ++++++++---
 src/yggdrasil/tcp.go    |  5 +++--
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/yggdrasil/switch.go b/src/yggdrasil/switch.go
index f4df60d..ece2fa2 100644
--- a/src/yggdrasil/switch.go
+++ b/src/yggdrasil/switch.go
@@ -712,10 +712,15 @@ func (t *switchTable) _handleIn(packet []byte, idle map[switchPort]struct{}) boo
 		}
 	}
 	if best != nil {
-		// Send to the best idle next hop
 		delete(idle, best.elem.port)
-		ports[best.elem.port].sendPacketsFrom(t, [][]byte{packet})
-		return true
+		// Tell ourselves to send to this node later
+		// If another (e.g. even better) hop becomes idle in the mean time, it'll take the packet instead
+		// FIXME this is just a hack, but seems to help with stability...
+		go t.Act(nil, func() {
+			t._idleIn(best.elem.port)
+		})
+		//ports[best.elem.port].sendPacketsFrom(t, [][]byte{packet})
+		//return true
 	}
 	// Didn't find anyone idle to send it to
 	return false
diff --git a/src/yggdrasil/tcp.go b/src/yggdrasil/tcp.go
index ed8f7b9..66f708c 100644
--- a/src/yggdrasil/tcp.go
+++ b/src/yggdrasil/tcp.go
@@ -233,8 +233,9 @@ func (t *tcp) call(saddr string, options interface{}, sintf string) {
 		}
 		defer func() {
 			// Block new calls for a little while, to mitigate livelock scenarios
-			time.Sleep(default_timeout)
-			time.Sleep(time.Duration(rand.Intn(1000)) * time.Millisecond)
+			rand.Seed(time.Now().UnixNano())
+			delay := default_timeout + time.Duration(rand.Intn(10000))*time.Millisecond
+			time.Sleep(delay)
 			t.mutex.Lock()
 			delete(t.calls, callname)
 			t.mutex.Unlock()