From 5e170e22e116423fb44310482709062614b5b07d Mon Sep 17 00:00:00 2001
From: Arceliar <Arceliar@users.noreply.github.com>
Date: Sat, 30 May 2020 10:47:54 -0500
Subject: [PATCH] more switch fixes

---
 src/yggdrasil/switch.go | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/yggdrasil/switch.go b/src/yggdrasil/switch.go
index ebdeea45..9cea91eb 100644
--- a/src/yggdrasil/switch.go
+++ b/src/yggdrasil/switch.go
@@ -392,6 +392,9 @@ func (t *switchTable) _handleMsg(msg *switchMsg, fromPort switchPort, reprocessi
 		sender.key = prevKey
 		prevKey = hop.Next
 	}
+	if sender.key == t.key {
+		return // Don't peer with ourself via different interfaces
+	}
 	sender.msg = *msg
 	sender.port = fromPort
 	sender.time = now
@@ -516,8 +519,8 @@ func (t *switchTable) _handleMsg(msg *switchMsg, fromPort switchPort, reprocessi
 	}
 	// Note that we depend on the LIFO order of the stack of defers here...
 	if updateRoot {
+		doUpdate = true
 		if !equiv(&sender.locator, &t.data.locator) {
-			doUpdate = true
 			t.data.seq++
 			defer t.core.router.reset(t)
 		}
@@ -528,8 +531,8 @@ func (t *switchTable) _handleMsg(msg *switchMsg, fromPort switchPort, reprocessi
 		t.parent = sender.port
 		defer t.core.peers.sendSwitchMsgs(t)
 	}
-	if true || doUpdate {
-		defer t._updateTable()
+	if doUpdate {
+		t._updateTable()
 	}
 	return
 }
@@ -546,9 +549,7 @@ func (t *switchTable) _updateTable() {
 	}
 	newTable._init()
 	for _, pinfo := range t.data.peers {
-		if pinfo.blocked ||
-			pinfo.locator.root != newTable.self.root ||
-			pinfo.key == t.key {
+		if pinfo.blocked || pinfo.locator.root != newTable.self.root {
 			continue
 		}
 		loc := pinfo.locator.clone()