diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2014-08-19 14:11:02 -0700 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2014-08-19 14:11:02 -0700 |
| commit | 721625d51248bb7152bce7ed9b5eadab324d43dd (patch) | |
| tree | 8f74715f25bce191a5bce927bcd109f1852875a5 /node/NodeConfig.cpp | |
| parent | 282114e96c6b405636a8e4f7011ced5ddd26357e (diff) | |
| download | infinitytier-721625d51248bb7152bce7ed9b5eadab324d43dd.tar.gz infinitytier-721625d51248bb7152bce7ed9b5eadab324d43dd.zip | |
Add MAC to listnetworks, and some other make stuff.
Diffstat (limited to 'node/NodeConfig.cpp')
| -rw-r--r-- | node/NodeConfig.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/node/NodeConfig.cpp b/node/NodeConfig.cpp index b9f6b138..3b5ce2f6 100644 --- a/node/NodeConfig.cpp +++ b/node/NodeConfig.cpp @@ -226,7 +226,7 @@ void NodeConfig::_doCommand(IpcConnection *ipcc,const char *commandLine) _r->topology->eachPeer(_DumpPeerStatistics(ipcc)); } else if (cmd[0] == "listnetworks") { Mutex::Lock _l(_networks_m); - ipcc->printf("200 listnetworks <nwid> <name> <status> <config age> <type> <dev> <ips>"ZT_EOL_S); + ipcc->printf("200 listnetworks <nwid> <name> <mac> <status> <config age> <type> <dev> <ips>"ZT_EOL_S); for(std::map< uint64_t,SharedPtr<Network> >::const_iterator nw(_networks.begin());nw!=_networks.end();++nw) { std::string tmp; std::set<InetAddress> ips(nw->second->ips()); @@ -244,9 +244,10 @@ void NodeConfig::_doCommand(IpcConnection *ipcc,const char *commandLine) age /= 1000; std::string dn(nw->second->tapDeviceName()); - ipcc->printf("200 listnetworks %.16llx %s %s %lld %s %s %s"ZT_EOL_S, + ipcc->printf("200 listnetworks %.16llx %s %s %s %lld %s %s %s"ZT_EOL_S, (unsigned long long)nw->first, ((nconf) ? nconf->name().c_str() : "?"), + nw->second->mac().toString().c_str(), Network::statusString(nw->second->status()), age, ((nconf) ? (nconf->isPublic() ? "public" : "private") : "?"), |