From 567969d33cb41b3d9214fea4a0060d05e8d0bd39 Mon Sep 17 00:00:00 2001
From: Adam Ierymenko <adam.ierymenko@zerotier.com>
Date: Fri, 4 Mar 2022 14:54:51 -0500
Subject: [PATCH] 1.8.6 with a UI non-responsiveness fix.

---
 RELEASE-NOTES.md       |  6 ++++++
 service/OneService.cpp | 46 ++++++++++++++++++------------------------
 version.h              |  2 +-
 3 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
index 7fc7cb761..70eda898f 100644
--- a/RELEASE-NOTES.md
+++ b/RELEASE-NOTES.md
@@ -1,12 +1,18 @@
 ZeroTier Release Notes
 ======
 
+# 2022-03-04 -- Version 1.8.6
+
+ * Fixed an issue that could cause the UI to be non-responsive if not joined to any networks.
+ * Fix dependency issues in Debian and RedHat packages for some distributions (Fedora, Mint).
+
 # 2022-02-22 -- Version 1.8.5
 
  * Plumbing under the hood for endpoint device SSO support.
  * Fix in LinuxEthernetTap to tap device support on very old (2.6) Linux kernels.
  * Fix an issue that could cause self-hosted roots ("moons") to fail to assist peers in making direct links. (GitHub issue #1512)
  * Merge a series of changes by Joseph Henry (of ZeroTier) that should fix some edge cases where ZeroTier would "forget" valid paths.
+ * Minor multipath improvements for automatic path negotiation.
 
 # 2021-11-30 -- Version 1.8.4
 
diff --git a/service/OneService.cpp b/service/OneService.cpp
index 73b3a9d56..f8ecb6823 100644
--- a/service/OneService.cpp
+++ b/service/OneService.cpp
@@ -1579,37 +1579,31 @@ public:
 					}
 				} else if (ps[0] == "network") {
 					Mutex::Lock _l(_nets_m);
-					if (!_nets.empty()) {
-						if (ps.size() == 1) {
-							// Return [array] of all networks
+					if (ps.size() == 1) {
+						// Return [array] of all networks
 
-							res = nlohmann::json::array();
-							
-							for (auto it = _nets.begin(); it != _nets.end(); ++it) {
-								NetworkState &ns = it->second;
-								nlohmann::json nj;
-								_networkToJson(nj, ns);
-								res.push_back(nj);
-							}
+						res = nlohmann::json::array();
 
+						for (auto it = _nets.begin(); it != _nets.end(); ++it) {
+							NetworkState &ns = it->second;
+							nlohmann::json nj;
+							_networkToJson(nj, ns);
+							res.push_back(nj);
+						}
+
+						scode = 200;
+					} else if (ps.size() == 2) {
+						// Return a single network by ID or 404 if not found
+
+						const uint64_t wantnw = Utils::hexStrToU64(ps[1].c_str());
+						if (_nets.find(wantnw) != _nets.end()) {
+							res = json::object();
+							NetworkState& ns = _nets[wantnw];
+							_networkToJson(res, ns);
 							scode = 200;
-						} else if (ps.size() == 2) {
-							// Return a single network by ID or 404 if not found
-
-							const uint64_t wantnw = Utils::hexStrToU64(ps[1].c_str());
-							if (_nets.find(wantnw) != _nets.end()) {
-								res = json::object();
-								NetworkState& ns = _nets[wantnw];
-								_networkToJson(res, ns);
-								scode = 200;
-							}
-						} else {
-							fprintf(stderr, "not found\n");
-							scode = 404;
 						}
 					} else {
-						fprintf(stderr, "_nets is empty??\n");
-						scode = 500;
+						scode = 404;
 					}
 				} else if (ps[0] == "peer") {
 					ZT_PeerList *pl = _node->peers();
diff --git a/version.h b/version.h
index e4e7e4cc4..9b311bb12 100644
--- a/version.h
+++ b/version.h
@@ -27,7 +27,7 @@
 /**
  * Revision
  */
-#define ZEROTIER_ONE_VERSION_REVISION 5
+#define ZEROTIER_ONE_VERSION_REVISION 6
 
 /**
  * Build version