From 5cabb60a6f82b8a00b157fde3655356835285d82 Mon Sep 17 00:00:00 2001
From: Adam Ierymenko <adam.ierymenko@gmail.com>
Date: Thu, 8 Aug 2013 10:41:17 -0400
Subject: Actually report a meaningful network status instead of always OK

---
 node/NodeConfig.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'node/NodeConfig.cpp')

diff --git a/node/NodeConfig.cpp b/node/NodeConfig.cpp
index 259c1b82..87f85c22 100644
--- a/node/NodeConfig.cpp
+++ b/node/NodeConfig.cpp
@@ -175,11 +175,12 @@ std::vector<std::string> NodeConfig::execute(const char *command)
 			}
 			// TODO: display network status, such as "permission denied to closed
 			// network" or "waiting".
-			_P("200 listnetworks %.16llx OK %s %s %s",
+			_P("200 listnetworks %.16llx %s %s %s %s",
 				(unsigned long long)nw->first,
-				(nw->second->isOpen() ? "public" : "private"),
+				Network::statusString(nw->second->status()),
+				(nw->second->isOpen() ? "open" : "private"),
 				nw->second->tap().deviceName().c_str(),
-				tmp.c_str());
+				((tmp.length() > 0) ? tmp.c_str() : "-"));
 		}
 	} else if (cmd[0] == "join") {
 		if (cmd.size() > 1) {
-- 
cgit v1.2.3