diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2013-08-08 10:41:17 -0400 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2013-08-08 10:41:17 -0400 |
| commit | 5cabb60a6f82b8a00b157fde3655356835285d82 (patch) | |
| tree | ac19c54637a8dbeef7b62cecc43f141d2c3f37ba /node/NodeConfig.cpp | |
| parent | 86056fdbd923fbf55f85b3db704bba021ea90c4f (diff) | |
| download | infinitytier-5cabb60a6f82b8a00b157fde3655356835285d82.tar.gz infinitytier-5cabb60a6f82b8a00b157fde3655356835285d82.zip | |
Actually report a meaningful network status instead of always OK
Diffstat (limited to 'node/NodeConfig.cpp')
| -rw-r--r-- | node/NodeConfig.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
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) { |