From 84a4f54217e9ad34ca4a5beab8fb0c9b7b84c370 Mon Sep 17 00:00:00 2001
From: Arceliar <Arceliar@users.noreply.github.com>
Date: Mon, 5 Aug 2019 18:49:15 -0500
Subject: [PATCH 1/2] temporary fix to nil pointer, better to make sure it's
 never nil

---
 src/yggdrasil/router.go | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/yggdrasil/router.go b/src/yggdrasil/router.go
index 2df7684f..161ae60a 100644
--- a/src/yggdrasil/router.go
+++ b/src/yggdrasil/router.go
@@ -161,7 +161,9 @@ func (r *router) handleTraffic(packet []byte) {
 		return
 	}
 	sinfo, isIn := r.core.sessions.getSessionForHandle(&p.Handle)
-	if !isIn {
+	if !isIn || sinfo.cancel == nil {
+		// FIXME make sure sinfo.cancel can never be nil
+		util.PutBytes(p.Payload)
 		return
 	}
 	select {

From 8a8514981769eacff68f226150cbcd6a3fa9ff34 Mon Sep 17 00:00:00 2001
From: Arceliar <Arceliar@users.noreply.github.com>
Date: Mon, 5 Aug 2019 18:50:08 -0500
Subject: [PATCH 2/2] remove src/.DS_Store

---
 src/.DS_Store | Bin 6148 -> 0 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 src/.DS_Store

diff --git a/src/.DS_Store b/src/.DS_Store
deleted file mode 100644
index 5008ddfcf53c02e82d7eee2e57c38e5672ef89f6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6148
zcmeH~Jr2S!425mzP>H1@V-^m;4Wg<&0T*E43hX&L&p$$qDprKhvt+--jT7}7np#A3
zem<@ulZcFPQ@L2!n>{z**<q8>++&mCkOWA81W14cNZ<zv;LbK1Poaz?KmsK2CSc!(
z0ynLxE!0092;Krf2c+FF_Fe*7ECH>lEfg7;MkzE(HCqgga^y>{tEnwC%0;vJ&^%eQ
zLs35+`xjp>T0<F0fCPF1$Cyrb|F7^5{eNG?83~ZUUlGt@xh*qZDeu<Z%US-OSsOPv
j)R!Z4KLME7ReXlK;d!wEw5GODWMKRea10D2@KpjYNUI8I