From 40553a6a44e88c3df8e164f7b2386d92c3bc93cc Mon Sep 17 00:00:00 2001
From: Arceliar <Arceliar@users.noreply.github.com>
Date: Sat, 29 Jun 2019 18:56:26 -0500
Subject: [PATCH] make GetSessions use the session workers to avoid races

---
 src/yggdrasil/api.go | 33 ++++++++++++++++++++++++---------
 1 file changed, 24 insertions(+), 9 deletions(-)

diff --git a/src/yggdrasil/api.go b/src/yggdrasil/api.go
index 864e7f37..7270bc2e 100644
--- a/src/yggdrasil/api.go
+++ b/src/yggdrasil/api.go
@@ -211,16 +211,31 @@ func (c *Core) GetSessions() []Session {
 	var sessions []Session
 	getSessions := func() {
 		for _, sinfo := range c.sessions.sinfos {
-			// TODO? skipped known but timed out sessions?
-			session := Session{
-				Coords:      append([]byte{}, sinfo.coords...),
-				MTU:         sinfo.getMTU(),
-				BytesSent:   sinfo.bytesSent,
-				BytesRecvd:  sinfo.bytesRecvd,
-				Uptime:      time.Now().Sub(sinfo.timeOpened),
-				WasMTUFixed: sinfo.wasMTUFixed,
+			var session Session
+			workerFunc := func() {
+				session := Session{
+					Coords:      append([]byte{}, sinfo.coords...),
+					MTU:         sinfo.getMTU(),
+					BytesSent:   sinfo.bytesSent,
+					BytesRecvd:  sinfo.bytesRecvd,
+					Uptime:      time.Now().Sub(sinfo.timeOpened),
+					WasMTUFixed: sinfo.wasMTUFixed,
+				}
+				copy(session.PublicKey[:], sinfo.theirPermPub[:])
 			}
-			copy(session.PublicKey[:], sinfo.theirPermPub[:])
+			var skip bool
+			func() {
+				defer func() {
+					if recover() != nil {
+						skip = true
+					}
+				}()
+				sinfo.doWorker(workerFunc)
+			}()
+			if skip {
+				continue
+			}
+			// TODO? skipped known but timed out sessions?
 			sessions = append(sessions, session)
 		}
 	}